diff --git a/package.json b/package.json
index d698b68d..60e2e597 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "oauth": "^0.9.12",
     "q": "^1.0.1",
     "serve-static": "^1.5.3",
-    "socket.io": "Automattic/socket.io#5863903",
+    "socket.io": "^1.1.0",
     "yamljs": "^0.1.5"
   }
 }
diff --git a/www/js/callbacks.js b/www/js/callbacks.js
index 14a510d3..3ee748b8 100644
--- a/www/js/callbacks.js
+++ b/www/js/callbacks.js
@@ -1106,11 +1106,12 @@ try {
         throw false;
     }
 
+    var opts = { transports: ["websocket", "polling"] };
     if (IO_URL === IO_URLS["ipv4-ssl"] || IO_URL === IO_URLS["ipv6-ssl"]) {
+        opts.secure = true;
         socket = io(IO_URL, { secure: true });
-    } else {
-        socket = io(IO_URL);
     }
+    socket = io(IO_URL, opts);
     setupCallbacks();
 } catch (e) {
     if (e) {