diff --git a/server/camlistored/camlistored.go b/server/camlistored/camlistored.go
index fd2691850..a3b3b9139 100644
--- a/server/camlistored/camlistored.go
+++ b/server/camlistored/camlistored.go
@@ -366,6 +366,8 @@ func main() {
 			}
 		}()
 	}
+
 	go ws.Serve()
-	handleSignals()
+	go handleSignals()
+	select{}
 }