diff --git a/scm-server/src/main/java/sonia/scm/server/ScmServer.java b/scm-server/src/main/java/sonia/scm/server/ScmServer.java
index 13da881679..507e12a37f 100644
--- a/scm-server/src/main/java/sonia/scm/server/ScmServer.java
+++ b/scm-server/src/main/java/sonia/scm/server/ScmServer.java
@@ -94,10 +94,10 @@ public class ScmServer extends Thread
     {
       if (!initialized)
       {
-        server.join();
+        init();
       }
 
-      server.start();
+      server.join();
     }
     catch (Exception ex)
     {