diff --git a/script/websocket_server.rb b/script/websocket_server.rb
index 518a54872..d72e5ea13 100644
--- a/script/websocket_server.rb
+++ b/script/websocket_server.rb
@@ -43,8 +43,6 @@ end
 
 begin
   EM.run {
-
-
     Diaspora::WebSocket.initialize_channels
 
     EventMachine::WebSocket.start(
@@ -74,7 +72,7 @@ begin
           Diaspora::WebSocket.unsubscribe(user_id, sid) }
       }
     end
-    PID_FILE = APP_CONFIG[:socket_pidfile]
+    PID_FILE = APP_CONFIG[:socket_pidfile] ? APP_CONFIG[:socket_pidfile] : 'tmp/diaspora-ws.pid'
     write_pidfile
     puts "Websocket server started."
     process_message