diff --git a/app/clients/orchestrator_client.py b/app/clients/orchestrator_client.py
index 6699279..fab4c23 100644
--- a/app/clients/orchestrator_client.py
+++ b/app/clients/orchestrator_client.py
@@ -347,8 +347,9 @@ class OrchestratorClient:
         # Handle response based on registration flow
         if "agent_secret" in data:
             # New secure registration response
-            self._agent_id = data["agent_id"]
-            self._agent_secret = data["agent_secret"]
+            # Use setters to trigger client invalidation
+            self.agent_id = data["agent_id"]
+            self.agent_secret = data["agent_secret"]
             self._tenant_id = data.get("tenant_id")
 
             # Persist credentials for restart recovery
@@ -362,8 +363,9 @@ class OrchestratorClient:
             return self._agent_id, self._agent_secret, self._tenant_id
         else:
             # Legacy registration response
-            self._agent_id = data["agent_id"]
-            self._token = data.get("token")
+            # Use setters to trigger client invalidation
+            self.agent_id = data["agent_id"]
+            self.token = data.get("token")
             self._tenant_id = self.settings.tenant_id
 
             # Also persist legacy credentials