diff --git a/src/dorkbox/network/connection/EndPointClient.java b/src/dorkbox/network/connection/EndPointClient.java
index d4558d39..957722ab 100644
--- a/src/dorkbox/network/connection/EndPointClient.java
+++ b/src/dorkbox/network/connection/EndPointClient.java
@@ -53,6 +53,8 @@ class EndPointClient<C extends Connection> extends EndPoint<C> implements Runnab
 
     protected
     void registerNextProtocol() {
+        this.registrationComplete = false; // always reset.
+
         new Thread(this, "Bootstrap registration").start();
     }
 
diff --git a/test/dorkbox/network/ReconnectTest.java b/test/dorkbox/network/ReconnectTest.java
index 9736fc50..0ea5ddc9 100644
--- a/test/dorkbox/network/ReconnectTest.java
+++ b/test/dorkbox/network/ReconnectTest.java
@@ -41,28 +41,11 @@ class ReconnectTest extends BaseTest {
         configuration.host = host;
 
 
-        Server server = null;
+        Server server = new Server(configuration);
+        server.disableRemoteKeyValidation();
 
-        // try to reconnect 10 times
-        boolean success = false;
-        for (int i = 0; i < 10; i++) {
-            try {
-                server = new Server(configuration);
-                server.disableRemoteKeyValidation();
-
-                server.bind(false);
-                addEndPoint(server);
-                success = true;
-                break;
-            } catch (Throwable ignored) {
-                System.out.println("Retrying...");
-                Thread.sleep(4000);
-            }
-        }
-
-        if (!success) {
-            throw new RuntimeException("Unable to bind to TCP port. Aborting.");
-        }
+        server.bind(false);
+        addEndPoint(server);
 
         server.listeners()
               .add(new Listener<Object>() {