diff --git a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/RunMojo.java b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/RunMojo.java
index 2db38c4d03..c83c986a69 100644
--- a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/RunMojo.java
+++ b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/RunMojo.java
@@ -285,7 +285,10 @@ public class RunMojo extends AbstractBaseScmMojo
       new JettyStopMonitorThread(server, stopPort, stopKey).start();
       server.start();
 
-      // server.join();
+      if (!backgroud)
+      {
+        server.join();
+      }
     }
     catch (Exception ex)
     {