diff --git a/src/main/java/org/java_websocket/server/WebSocketServer.java b/src/main/java/org/java_websocket/server/WebSocketServer.java
index 55b4fe8ae..2f466a5f8 100644
--- a/src/main/java/org/java_websocket/server/WebSocketServer.java
+++ b/src/main/java/org/java_websocket/server/WebSocketServer.java
@@ -915,8 +915,8 @@ public void run() {
 					} catch(Exception e){
 						log.error("Error while reading from remote connection", e);
 					}
-					
 					finally {
+						ws = null;
 						pushBuffer( buf );
 					}
 				}