diff --git a/app/views/js/_websocket_js.haml b/app/views/js/_websocket_js.haml
index 4187ff631..f021fb1c1 100644
--- a/app/views/js/_websocket_js.haml
+++ b/app/views/js/_websocket_js.haml
@@ -2,9 +2,13 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-:javascript
-  WebSocket.__swfLocation = "#{javascript_path 'vendor/WebSocketMain.swf'}";
-  $(document).ready(function(){
-    WSR.initialize("#{(AppConfig[:socket_secure])?'wss':'ws'}://#{request.host}:#{AppConfig[:socket_port]}/");
-  });
- 
+-if AppConfig[:single_process_mode]
+  :javascript
+    var websocket_enabled = false
+- else
+  :javascript
+    var websocket_enabled = true
+    WebSocket.__swfLocation = "#{javascript_path 'vendor/WebSocketMain.swf'}";
+    $(document).ready(function(){
+      WSR.initialize("#{(AppConfig[:socket_secure])?'wss':'ws'}://#{request.host}:#{AppConfig[:socket_port]}/");
+    });
diff --git a/public/javascripts/web-socket-receiver.js b/public/javascripts/web-socket-receiver.js
index e0ad2349c..70a448adf 100644
--- a/public/javascripts/web-socket-receiver.js
+++ b/public/javascripts/web-socket-receiver.js
@@ -6,14 +6,16 @@ var WebSocketReceiver = {
     //Attach onmessage to websocket
     ws.onmessage = WSR.onMessage;
     ws.onclose = function() {
-      Diaspora.widgets.notifications.showNotification({
-        html: '<div class="notification">' +
-            Diaspora.widgets.i18n.t("web_sockets.disconnected") +
-          '</div>',
-        incrementCount: false
-      });
+      if (websocket_enabled) {
+        Diaspora.widgets.notifications.showNotification({
+          html: '<div class="notification">' +
+              Diaspora.widgets.i18n.t("web_sockets.disconnected") +
+            '</div>',
+          incrementCount: false
+        });
 
-      WSR.debug("socket closed");
+        WSR.debug("socket closed");
+      }
     };
     ws.onopen = function() {
       ws.send(location.pathname);