diff --git a/client/ui/models/servers_model.cpp b/client/ui/models/servers_model.cpp
index a44202553..2449de77a 100644
--- a/client/ui/models/servers_model.cpp
+++ b/client/ui/models/servers_model.cpp
@@ -249,7 +249,7 @@ void ServersModel::editServer(const QJsonObject &server, const int serverIndex)
     }
     updateContainersModel();
 
-    if (isDefaultServerCurrentlyProcessed()) {
+    if (serverIndex == m_defaultServerIndex) {
         auto defaultContainer = qvariant_cast<DockerContainer>(getDefaultServerData("defaultContainer"));
         emit defaultServerDefaultContainerChanged(defaultContainer);
     }