diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 5079ed87..40aab515 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -376,7 +376,4 @@ void AmneziaApplication::initControllers()
 
     m_cloudController.reset(new ApiController(m_serversModel, m_containersModel));
     m_engine->rootContext()->setContextProperty("ApiController", m_cloudController.get());
-
-    //    connect(m_cloudController.get(), &ApiController::serverConfigUpdated, this,
-    //            [this]() { m_containersModel->setCurrentlyProcessedServerIndex(m_serversModel->getDefaultServerIndex()); });
 }
diff --git a/client/ui/controllers/apiController.cpp b/client/ui/controllers/apiController.cpp
index d0c440df..14a05410 100644
--- a/client/ui/controllers/apiController.cpp
+++ b/client/ui/controllers/apiController.cpp
@@ -109,9 +109,11 @@ bool ApiController::updateServerConfigFromApi()
             serverConfig.insert(config_key::dns2, cloudConfig.value(config_key::dns2));
             serverConfig.insert(config_key::containers, cloudConfig.value(config_key::containers));
             serverConfig.insert(config_key::hostName, cloudConfig.value(config_key::hostName));
-            serverConfig.insert(config_key::defaultContainer, cloudConfig.value(config_key::defaultContainer));
+
+            auto defaultContainer = cloudConfig.value(config_key::defaultContainer).toString();
+            serverConfig.insert(config_key::defaultContainer, defaultContainer);
             m_serversModel->editServer(serverConfig);
-            emit serverConfigUpdated();
+            emit m_serversModel->defaultContainerChanged(ContainerProps::containerFromString(defaultContainer));
         } else {
             QString err = reply->errorString();
             qDebug() << QString::fromUtf8(reply->readAll()); //todo remove debug output
diff --git a/client/ui/controllers/apiController.h b/client/ui/controllers/apiController.h
index 5917f70f..1ce933c6 100644
--- a/client/ui/controllers/apiController.h
+++ b/client/ui/controllers/apiController.h
@@ -20,7 +20,6 @@ public slots:
 
 signals:
     void errorOccurred(const QString &errorMessage);
-    void serverConfigUpdated();
 
 private:
     QString genPublicKey(const QString &protocol);