diff --git a/pype/modules/ftrack/tray/login_dialog.py b/pype/modules/ftrack/tray/login_dialog.py
index aeed82671f..94ad29e478 100644
--- a/pype/modules/ftrack/tray/login_dialog.py
+++ b/pype/modules/ftrack/tray/login_dialog.py
@@ -238,6 +238,8 @@ class CredentialsDialog(QtWidgets.QDialog):
 
         # If there is an existing server thread running we need to stop it.
         if self._login_server_thread:
+            if self._login_server_thread.isAlive():
+                self._login_server_thread.stop()
             self._login_server_thread.join()
             self._login_server_thread = None
 
diff --git a/pype/modules/ftrack/tray/login_tools.py b/pype/modules/ftrack/tray/login_tools.py
index e7d22fbc19..d3297eaa76 100644
--- a/pype/modules/ftrack/tray/login_tools.py
+++ b/pype/modules/ftrack/tray/login_tools.py
@@ -61,12 +61,17 @@ class LoginServerThread(threading.Thread):
     def __init__(self, url, callback):
         self.url = url
         self.callback = callback
+        self._server = None
         super(LoginServerThread, self).__init__()
 
     def _handle_login(self, api_user, api_key):
         '''Login to server with *api_user* and *api_key*.'''
         self.callback(api_user, api_key)
 
+    def stop(self):
+        if self._server:
+            self._server.server_close()
+
     def run(self):
         '''Listen for events.'''
         self._server = HTTPServer(