diff --git a/openpype/modules/default_modules/ftrack/ftrack_module.py b/openpype/modules/default_modules/ftrack/ftrack_module.py
index 5a1fdbc276..73a4dfee82 100644
--- a/openpype/modules/default_modules/ftrack/ftrack_module.py
+++ b/openpype/modules/default_modules/ftrack/ftrack_module.py
@@ -371,7 +371,7 @@ class FtrackModule(
         return self.tray_module.validate()
 
     def tray_exit(self):
-        return self.tray_module.stop_action_server()
+        self.tray_module.tray_exit()
 
     def set_credentials_to_env(self, username, api_key):
         os.environ["FTRACK_API_USER"] = username or ""
diff --git a/openpype/modules/default_modules/ftrack/tray/ftrack_tray.py b/openpype/modules/default_modules/ftrack/tray/ftrack_tray.py
index 34e4646767..c6201a94f6 100644
--- a/openpype/modules/default_modules/ftrack/tray/ftrack_tray.py
+++ b/openpype/modules/default_modules/ftrack/tray/ftrack_tray.py
@@ -289,6 +289,10 @@ class FtrackTrayWrapper:
 
         parent_menu.addMenu(tray_menu)
 
+    def tray_exit(self):
+        self.stop_action_server()
+        self.stop_timer_thread()
+
     # Definition of visibility of each menu actions
     def set_menu_visibility(self):
         self.tray_server_menu.menuAction().setVisible(self.bool_logged)