diff --git a/public/io/io/WebSocket.js b/public/io/io/WebSocket.js
index 08b1859..be6e5b8 100644
--- a/public/io/io/WebSocket.js
+++ b/public/io/io/WebSocket.js
@@ -250,6 +250,10 @@ var WebSocketClass = WBEventEmitter.extend({
     var self = this;
 
     self.clearSocketTimeout();
+    self.socket.removeEventListener('close', self.onSocketClose);
+    self.socket.removeEventListener('error', self.onSocketError);
+    self.socket.removeEventListener('message', self.onSocketMessage);
+    self.socket.removeEventListener('open', self.onSocketOpen);
     self.socket = undefined;
     localConsole.info('closed', e);
     /**
diff --git a/public/wunderbits/WBOnlineStatus.js b/public/wunderbits/WBOnlineStatus.js
index c766001..d50b36b 100644
--- a/public/wunderbits/WBOnlineStatus.js
+++ b/public/wunderbits/WBOnlineStatus.js
@@ -39,6 +39,10 @@ var WBOnlineStatus = WBEventEmitter.extend({
 
   'destroy': function () {
 
+    var self = this;
+
+    global.removeEventListener('online', self.onOnline.bind(self), false);
+    global.removeEventListener('offline', self.onOffline.bind(self), false);
     HealthCheck.destroy();
   },