diff --git a/src/lib/gui/MainWindow.cpp b/src/lib/gui/MainWindow.cpp
index 529ad9581..355c0ed20 100644
--- a/src/lib/gui/MainWindow.cpp
+++ b/src/lib/gui/MainWindow.cpp
@@ -1234,5 +1234,7 @@ void MainWindow::remoteHostChanged(const QString &newRemoteHost)
   toggleCanRunCore(!newRemoteHost.isEmpty() && ui->rbModeClient->isChecked());
   if (newRemoteHost.isEmpty()) {
     Settings::setValue(Settings::Client::RemoteHost, QVariant());
+  } else {
+    Settings::setValue(Settings::Client::RemoteHost, newRemoteHost);
   }
 }