diff --git a/www/js/callbacks.js b/www/js/callbacks.js
index 4c5a985a..231ef915 100644
--- a/www/js/callbacks.js
+++ b/www/js/callbacks.js
@@ -1227,8 +1227,6 @@ function initSocket(socketConfig) {
     } else {
         initSocketIO(socketConfig);
     }
-
-    setupCallbacks();
 }
 
 function initSocketIO(socketConfig) {
@@ -1311,6 +1309,7 @@ function initWS(servers) {
     console.log('Using WSShim');
     console.log("Connecting to " + JSON.stringify(servers[0]));
     window.socket = new WSShim(servers[0].url);
+    setupCallbacks();
 }
 
 (function () {