diff --git a/TMessagesProj/jni/tgnet/ConnectionsManager.cpp b/TMessagesProj/jni/tgnet/ConnectionsManager.cpp
index 7b406027c..b1fb51d15 100644
--- a/TMessagesProj/jni/tgnet/ConnectionsManager.cpp
+++ b/TMessagesProj/jni/tgnet/ConnectionsManager.cpp
@@ -1890,16 +1890,16 @@ void ConnectionsManager::setUserId(int64_t userId) {
 }
 
 void ConnectionsManager::switchBackend(bool restart) {
-    //scheduleTask([&, restart] {
-    currentDatacenterId = 1;
-    testBackend = !testBackend;
-    datacenters.clear();
-    initDatacenters();
-    saveConfig();
-    if (restart) {
-        exit(1);
-    }
-    //});
+    scheduleTask([&, restart] {
+        currentDatacenterId = 1;
+        testBackend = !testBackend;
+        datacenters.clear();
+        initDatacenters();
+        saveConfig();
+        if (restart) {
+            exit(1);
+        }
+    });
 }
 
 void ConnectionsManager::removeRequestFromGuid(int32_t requestToken) {
diff --git a/TMessagesProj/jni/tgnet/Handshake.cpp b/TMessagesProj/jni/tgnet/Handshake.cpp
index 4dfa39dce..33b8e61ea 100644
--- a/TMessagesProj/jni/tgnet/Handshake.cpp
+++ b/TMessagesProj/jni/tgnet/Handshake.cpp
@@ -390,6 +390,8 @@ void Handshake::processHandshakeResponse(TLObject *message, int64_t messageId) {
                     loadCdnConfig(currentDatacenter);
                 } else {
                     if (LOGS_ENABLED) DEBUG_E("account%u dc%u handshake: can't find valid server public key, type = %d", currentDatacenter->instanceNum, currentDatacenter->datacenterId, handshakeType);
+                    serverPublicKeys.clear();
+                    serverPublicKeysFingerprints.clear();
                     beginHandshake(false);
                 }
                 return;