diff --git a/core/controllers/ConnectionController.py b/core/controllers/ConnectionController.py
index c7e8a67..3cb9044 100644
--- a/core/controllers/ConnectionController.py
+++ b/core/controllers/ConnectionController.py
@@ -315,11 +315,14 @@ class ConnectionController:
         return port_number
 
     @staticmethod
-    def await_connection(port_number: int = None, maximum_number_of_attempts: int = 2, connection_observer: Optional[ConnectionObserver] = None):
+    def await_connection(port_number: Optional[int] = None, maximum_number_of_attempts: Optional[int] = None, connection_observer: Optional[ConnectionObserver] = None):
 
         if port_number is None:
             ConnectionController.await_network_interface()
 
+        if maximum_number_of_attempts is None:
+            maximum_number_of_attempts = 2
+
         retry_interval = 5.0
 
         for retry_count in range(maximum_number_of_attempts):