diff --git a/core/servers/login/websocket.js b/core/servers/login/websocket.js
index 9e638a40..6f826cc9 100644
--- a/core/servers/login/websocket.js
+++ b/core/servers/login/websocket.js
@@ -41,7 +41,7 @@ function WebSocketClient(ws, req, serverType) {
 		}
 
 		end() {
-			return ws.terminate();
+			return ws.terminate();			
 		}
 
 		write(data, cb) {
@@ -59,7 +59,8 @@ function WebSocketClient(ws, req, serverType) {
 	});
 
 	ws.on('close', () => {
-		this.end();
+		//	we'll remove client connection which will in turn end() via our SocketBridge above
+		return this.emit('end');
 	});
 
 	//