diff --git a/‎td/telegram/AuthManager.cpp‎
Lines changed: 1 addition & 0 deletions b/‎td/telegram/AuthManager.cpp‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎td/telegram/net/NetQueryDispatcher.cpp‎
Lines changed: 3 additions & 0 deletions b/‎td/telegram/net/NetQueryDispatcher.cpp‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎td/telegram/net/Session.cpp‎
Lines changed: 3 additions & 2 deletions b/‎td/telegram/net/Session.cpp‎
Lines changed: 3 additions & 2 deletions
@@ -1283,6 +1283,7 @@ void AuthManager::on_import_web_token_authorization_result(NetQueryPtr &&net_que
   if (r_authorization.is_error()) {
     return on_current_query_error(r_authorization.move_as_error());
   }
+  CHECK(dc_id.is_internal());
   G()->net_query_dispatcher().set_main_dc_id(dc_id.get_value());
   on_get_authorization(r_authorization.move_as_ok());
 }
 
@@ -389,6 +389,9 @@ NetQueryDispatcher::NetQueryDispatcher(const std::function<ActorShared<>()> &cre
 NetQueryDispatcher::~NetQueryDispatcher() = default;
 
 void NetQueryDispatcher::try_fix_migrate(NetQueryPtr &net_query) {
+  if (net_query->dc_id().is_external()) {
+    return;
+  }
   auto error_message = net_query->error().message();
   static constexpr CSlice file_migrate_prefix = "FILE_MIGRATE_";
   if (begins_with(error_message, file_migrate_prefix)) {
 
@@ -873,10 +873,10 @@ Status Session::on_message_result_ok(mtproto::MessageId message_id, BufferSlice
   last_success_timestamp_ = Time::now();
 
   TlParser parser(packet.as_slice());
-  int32 response_tl_id = parser.fetch_int();
 
   auto it = sent_queries_.find(message_id);
   if (it == sent_queries_.end()) {
+    int32 response_tl_id = parser.fetch_int();
     LOG(DEBUG) << "Drop result to " << message_id << tag("original_size", original_size)
                << tag("response_tl", format::as_hex(response_tl_id));
 
@@ -896,9 +896,10 @@ Status Session::on_message_result_ok(mtproto::MessageId message_id, BufferSlice
   Query &query = it->second;
   VLOG(net_query) << "Return query result " << query.net_query_;
 
-  if (!parser.get_error()) {
+  if (!parser.get_error() && !auth_data_.get_auth_flag() && !is_cdn_) {
     // Steal authorization information.
     // It is a dirty hack, yep.
+    int32 response_tl_id = parser.fetch_int();
     if (response_tl_id == telegram_api::auth_authorization::ID ||
         response_tl_id == telegram_api::auth_loginTokenSuccess::ID ||
         response_tl_id == telegram_api::auth_sentCodeSuccess::ID) {
Original file line number	Diff line number	Diff line change
`@@ -1283,6 +1283,7 @@ void AuthManager::on_import_web_token_authorization_result(NetQueryPtr &&net_que`
`1283`	`1283`	`if (r_authorization.is_error()) {`
`1284`	`1284`	`return on_current_query_error(r_authorization.move_as_error());`
`1285`	`1285`	`}`
	`1286`	`+ CHECK(dc_id.is_internal());`
`1286`	`1287`	`G()->net_query_dispatcher().set_main_dc_id(dc_id.get_value());`
`1287`	`1288`	`on_get_authorization(r_authorization.move_as_ok());`
`1288`	`1289`	`}`