diff --git a/openpype/tools/tray/pype_tray.py b/openpype/tools/tray/pype_tray.py
index a5876ca721..db391b469a 100644
--- a/openpype/tools/tray/pype_tray.py
+++ b/openpype/tools/tray/pype_tray.py
@@ -632,6 +632,14 @@ class TrayManager:
             self.exit()
 
         elif result.restart or result.token_changed:
+            # Remove environment variables from current connection
+            # - keep develop, staging, headless values
+            for key in {
+                "AYON_SERVER_URL",
+                "AYON_API_KEY",
+                "AYON_BUNDLE_NAME",
+            }:
+                os.environ.pop(key, None)
             self.restart()
 
     def _on_restart_action(self):