diff --git a/src/dorkbox/network/connection/EndPointClient.java b/src/dorkbox/network/connection/EndPointClient.java
index 65614cbe..6ab7217a 100644
--- a/src/dorkbox/network/connection/EndPointClient.java
+++ b/src/dorkbox/network/connection/EndPointClient.java
@@ -70,12 +70,22 @@ class EndPointClient extends EndPoint {
 
         // have to BLOCK (must be outside of the synchronize call), we don't want the client to run before registration is complete
         try {
-            if (!registration.await(connectionTimeout, TimeUnit.MILLISECONDS)) {
-                closeConnection();
-                throw new IOException("Unable to complete registration within '" + connectionTimeout + "' milliseconds");
+            if (connectionTimeout > 0) {
+                if (!registration.await(connectionTimeout, TimeUnit.MILLISECONDS)) {
+                    closeConnection();
+                    throw new IOException("Unable to complete registration within '" + connectionTimeout + "' milliseconds");
+                }
+            }
+            else {
+                registration.await();
             }
         } catch (InterruptedException e) {
-            throw new IOException("Unable to complete registration within '" + connectionTimeout + "' milliseconds", e);
+            if (connectionTimeout > 0) {
+                throw new IOException("Unable to complete registration within '" + connectionTimeout + "' milliseconds", e);
+            }
+            else {
+                throw new IOException("Unable to complete registration.", e);
+            }
         }
     }
 
diff --git a/test/dorkbox/network/rmi/RmiGlobalTest.java b/test/dorkbox/network/rmi/RmiGlobalTest.java
index f84d4636..ffd01775 100644
--- a/test/dorkbox/network/rmi/RmiGlobalTest.java
+++ b/test/dorkbox/network/rmi/RmiGlobalTest.java
@@ -334,8 +334,7 @@ class RmiGlobalTest extends BaseTest {
                   }
               });
 
-        // client.connect(5000);
-        client.connect(0);
+        client.connect(5000);
         waitForThreads();
     }
 
diff --git a/test/dorkbox/network/rmi/multiJVM/TestClient.java b/test/dorkbox/network/rmi/multiJVM/TestClient.java
index 274bef7a..46a99553 100644
--- a/test/dorkbox/network/rmi/multiJVM/TestClient.java
+++ b/test/dorkbox/network/rmi/multiJVM/TestClient.java
@@ -122,8 +122,7 @@ class TestClient
                       }
                   });
 
-            client.connect(0);
-
+            client.connect(3000);
             client.waitForShutdown();
         } catch (Exception e) {
             e.printStackTrace();