diff --git a/agent-node/VERSION b/agent-node/VERSION
index 6f18242..c442f5e 100644
--- a/agent-node/VERSION
+++ b/agent-node/VERSION
@@ -1 +1 @@
-1.1.21
+1.1.22
diff --git a/agent-node/src/agent_node/node.py b/agent-node/src/agent_node/node.py
index 9eb8ba0..ef52140 100644
--- a/agent-node/src/agent_node/node.py
+++ b/agent-node/src/agent_node/node.py
@@ -124,6 +124,17 @@
         if not self.start(): # From MeshNodeCore
             raise RuntimeError("Handshake failed, node cannot start.")
         
+        # Wait until connected (timeout 30s)
+        connected = False
+        for _ in range(30):
+            if self.transport.is_connected():
+                connected = True
+                break
+            time.sleep(1)
+            
+        if not connected:
+            raise RuntimeError("Transport failed to connect within timeout.")
+
         while not self._stop_event.is_set():
             if not self.transport.is_connected():
                 raise RuntimeError("Transport disconnected.")