diff --git a/submodules/MtProtoKit/MTProtoKit/MTRequestMessageService.m b/submodules/MtProtoKit/MTProtoKit/MTRequestMessageService.m
index e38b892aa7..17c09abe21 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTRequestMessageService.m
+++ b/submodules/MtProtoKit/MTProtoKit/MTRequestMessageService.m
@@ -291,6 +291,9 @@
     
     if (initializeApi && _apiEnvironment != nil)
     {
+        if (MTLogEnabled()) {
+            MTLog(@"apiEnvironment: %d", (int)_apiEnvironment.systemCode.length);
+        }
         MTBuffer *buffer = [[MTBuffer alloc] init];
         
         // invokeWithLayer
diff --git a/submodules/TelegramUI/TelegramUI/AppDelegate.swift b/submodules/TelegramUI/TelegramUI/AppDelegate.swift
index 5303bfa24a..396ec706f0 100644
--- a/submodules/TelegramUI/TelegramUI/AppDelegate.swift
+++ b/submodules/TelegramUI/TelegramUI/AppDelegate.swift
@@ -251,8 +251,9 @@ final class SharedApplicationContext {
         precondition(!testIsLaunched)
         testIsLaunched = true
         
-        self.deviceToken.set(voipTokenPromise.get()
-        |> map(Optional.init))
+        let _ = voipTokenPromise.get().start(next: { token in
+            self.deviceToken.set(.single(token))
+        })
         
         let launchStartTime = CFAbsoluteTimeGetCurrent()