diff --git a/src/apps/deskflow-gui/MainWindow.cpp b/src/apps/deskflow-gui/MainWindow.cpp
index d32430b1f..8450a464d 100644
--- a/src/apps/deskflow-gui/MainWindow.cpp
+++ b/src/apps/deskflow-gui/MainWindow.cpp
@@ -204,7 +204,6 @@ void MainWindow::setupControls()
   setWindowTitle(kAppName);
 
   secureSocket(false);
-  updateLocalFingerprint();
 
   ui->m_pLabelUpdate->setStyleSheet(kStyleNoticeLabel);
   ui->m_pLabelUpdate->hide();
@@ -360,7 +359,6 @@ void MainWindow::onConfigScopesSaving()
 
 void MainWindow::onAppConfigTlsChanged()
 {
-  updateLocalFingerprint();
   if (m_TlsUtility.isEnabled()) {
     m_TlsUtility.generateCertificate();
   }
@@ -674,6 +672,7 @@ void MainWindow::applyConfig()
 
   ui->lineHostname->setText(m_AppConfig.serverHostname());
   ui->lineClientIp->setText(m_ServerConfig.getClientAddress());
+  updateLocalFingerprint();
 }
 
 void MainWindow::applyCloseToTray() const