diff --git a/pype/ftrack/tray/ftrack_module.py b/pype/ftrack/tray/ftrack_module.py
index 1239e3c76c..563b11c388 100644
--- a/pype/ftrack/tray/ftrack_module.py
+++ b/pype/ftrack/tray/ftrack_module.py
@@ -77,6 +77,12 @@ class FtrackModule:
     def start_action_server(self):
         self.bool_action_thread_running = True
         self.set_menu_visibility()
+        if (
+            self.thread_action_server is not None and
+            self.bool_action_thread_running is False
+        ):
+            self.stop_action_server()
+
         if self.thread_action_server is None:
             self.thread_action_server = threading.Thread(
                 target=self.set_action_server