diff --git a/src/lib/gui/MainWindow.cpp b/src/lib/gui/MainWindow.cpp
index b13e58b17..4903d33c7 100644
--- a/src/lib/gui/MainWindow.cpp
+++ b/src/lib/gui/MainWindow.cpp
@@ -1187,10 +1187,10 @@ void MainWindow::showClientError(deskflow::client::ErrorType error, const QStrin
   m_clientErrorVisible = false;
 }
 
-void MainWindow::handleNewClientPromptRequest(const QString &clientName, bool usePeerAuth)
+void MainWindow::handleNewClientPromptRequest(const QString &clientName)
 {
   showAndActivate();
-  bool result = deskflow::gui::messages::showNewClientPrompt(this, clientName, usePeerAuth);
+  bool result = deskflow::gui::messages::showNewClientPrompt(this, clientName);
   m_serverConnection.handleNewClientResult(clientName, result);
 }
 
diff --git a/src/lib/gui/MainWindow.h b/src/lib/gui/MainWindow.h
index 82bf075c3..21c688f70 100644
--- a/src/lib/gui/MainWindow.h
+++ b/src/lib/gui/MainWindow.h
@@ -140,7 +140,7 @@ private:
   void daemonIpcClientConnectionFailed();
   void toggleCanRunCore(bool enableButtons);
   void remoteHostChanged(const QString &newRemoteHost);
-  void handleNewClientPromptRequest(const QString &clientName, bool usePeerAuth);
+  void handleNewClientPromptRequest(const QString &clientName);
   void updateIpLabel(const QStringList &addresses);
   void updateTimeoutDelay(int newDelay);
 
diff --git a/src/lib/gui/Messages.cpp b/src/lib/gui/Messages.cpp
index 7a81df80a..e9ca50cde 100644
--- a/src/lib/gui/Messages.cpp
+++ b/src/lib/gui/Messages.cpp
@@ -184,9 +184,10 @@ void showFirstConnectedMessage(QWidget *parent)
   QMessageBox::information(parent, title, message);
 }
 
-bool showNewClientPrompt(QWidget *parent, const QString &clientName, bool serverRequiresPeerAuth)
+bool showNewClientPrompt(QWidget *parent, const QString &clientName)
 {
-  if (serverRequiresPeerAuth) {
+  if (Settings::value(Settings::Security::TlsEnabled).toBool() &&
+      Settings::value(Settings::Security::CheckPeers).toBool()) {
     // When peer auth is enabled you will be prompted to allow the connection before seeing this dialog.
     // This is why we do not show a dialog with an option to ignore the new client
     QMessageBox::information(
diff --git a/src/lib/gui/Messages.h b/src/lib/gui/Messages.h
index d2bb88c87..858887e0e 100644
--- a/src/lib/gui/Messages.h
+++ b/src/lib/gui/Messages.h
@@ -25,7 +25,7 @@ void showFirstConnectedMessage(QWidget *parent);
 
 void showCloseReminder(QWidget *parent);
 
-bool showNewClientPrompt(QWidget *parent, const QString &clientName, bool serverRequiresPeerAuth = false);
+bool showNewClientPrompt(QWidget *parent, const QString &clientName);
 
 bool showClearSettings(QWidget *parent);
 
diff --git a/src/lib/gui/core/ServerConnection.cpp b/src/lib/gui/core/ServerConnection.cpp
index 94baa2ef1..f1ba9357d 100644
--- a/src/lib/gui/core/ServerConnection.cpp
+++ b/src/lib/gui/core/ServerConnection.cpp
@@ -82,9 +82,7 @@ void ServerConnection::handleNewClient(const QString &clientName)
   }
 
   m_messageShowing = true;
-  const bool tlsEnabled = Settings::value(Settings::Security::TlsEnabled).toBool();
-  const bool requireCerts = Settings::value(Settings::Security::CheckPeers).toBool();
-  Q_EMIT requestNewClientPrompt(clientName, tlsEnabled && requireCerts);
+  Q_EMIT requestNewClientPrompt(clientName);
 }
 
 void ServerConnection::handleNewClientResult(const QString &clientName, bool acceptClient)
diff --git a/src/lib/gui/core/ServerConnection.h b/src/lib/gui/core/ServerConnection.h
index 8fa698649..fa656479f 100644
--- a/src/lib/gui/core/ServerConnection.h
+++ b/src/lib/gui/core/ServerConnection.h
@@ -31,7 +31,7 @@ public:
   void handleNewClientResult(const QString &clientName, bool acceptClient);
 
 Q_SIGNALS:
-  void requestNewClientPrompt(const QString &clientName, bool peerAuthRequired);
+  void requestNewClientPrompt(const QString &clientName);
   void configureClient(const QString &clientName);
   void clientsChanged(const QStringList &clients);