diff --git a/src/se/vidstige/jadb/server/SocketServer.java b/src/se/vidstige/jadb/server/SocketServer.java
index 21099ad..85c27ff 100644
--- a/src/se/vidstige/jadb/server/SocketServer.java
+++ b/src/se/vidstige/jadb/server/SocketServer.java
@@ -58,7 +58,7 @@ public abstract class SocketServer implements Runnable {
 
     private void waitForServer() throws InterruptedException {
         synchronized (lockObject) {
-            if (!isStarted) {
+            while (!isStarted) {
                 lockObject.wait();
             }
         }