diff --git a/src/apps/deskflow-gui/MainWindow.cpp b/src/apps/deskflow-gui/MainWindow.cpp
index 5d6a367eb..5d74e8838 100644
--- a/src/apps/deskflow-gui/MainWindow.cpp
+++ b/src/apps/deskflow-gui/MainWindow.cpp
@@ -809,12 +809,6 @@ void MainWindow::checkFingerprint(const QString &line)
     return;
   }
 
-  if (isClient) {
-    m_checkedServers.append(sha256Text);
-  } else {
-    m_checkedClients.append(sha256Text);
-  }
-
   deskflow::FingerprintDatabase db;
   db.read(trustedFingerprintDb().toStdString());
 
@@ -823,6 +817,13 @@ void MainWindow::checkFingerprint(const QString &line)
     return;
   }
 
+  if (isClient) {
+    m_checkedServers.append(sha256Text);
+    m_coreProcess.stop();
+  } else {
+    m_checkedClients.append(sha256Text);
+  }
+
   auto dialogMode = isClient ? FingerprintDialogMode::Client : FingerprintDialogMode::Server;
 
   FingerprintDialog fingerprintDialog(this, {sha1, sha256}, dialogMode);
@@ -833,6 +834,7 @@ void MainWindow::checkFingerprint(const QString &line)
     db.write(trustedFingerprintDb().toStdString());
     if (isClient) {
       m_checkedServers.removeAll(sha256Text);
+      m_coreProcess.start();
     } else {
       m_checkedClients.removeAll(sha256Text);
     }