diff --git a/handlers/ws.go b/handlers/ws.go
index 37e8b8f..746d2bc 100644
--- a/handlers/ws.go
+++ b/handlers/ws.go
@@ -21,6 +21,7 @@ func WS(so socketio.Socket) {
 	session := core.SessionGet(sessionId)
 	if session == nil {
 		log.Printf("Session with id [%s] does not exist!\n", sessionId)
+		so.Disconnect()
 		return
 	}
 
diff --git a/www/assets/app.js b/www/assets/app.js
index c04d774..9596109 100644
--- a/www/assets/app.js
+++ b/www/assets/app.js
@@ -181,6 +181,7 @@
         socket.on('session end', function() {
           $scope.showAlert('Session timed out!', 'Your session has expired and all of your instances have been deleted.', '#sessionEnd')
           $scope.isAlive = false;
+          socket.close();
         });
 
         socket.on('viewport', function(rows, cols) {