diff --git a/td/telegram/ForumTopicManager.cpp b/td/telegram/ForumTopicManager.cpp
index 6cc343fa7..9b374501f 100644
--- a/td/telegram/ForumTopicManager.cpp
+++ b/td/telegram/ForumTopicManager.cpp
@@ -212,17 +212,8 @@ void ForumTopicManager::on_forum_topic_created(DialogId dialog_id, unique_ptr<Fo
                                                Promise<td_api::object_ptr<td_api::forumTopicInfo>> &&promise) {
   TRY_STATUS_PROMISE(promise, G()->close_status());
 
-  MessageId top_thread_message_id = forum_topic_info->get_thread_id();
-  auto topic_info = get_topic_info(dialog_id, top_thread_message_id);
-  if (topic_info == nullptr) {
-    if (dialog_topics_.get_pointer(dialog_id) == nullptr) {
-      dialog_topics_.set(dialog_id, make_unique<DialogTopics>());
-    }
-    dialog_topics_.get_pointer(dialog_id)->topic_infos_.set(top_thread_message_id, std::move(forum_topic_info));
-    topic_info = get_topic_info(dialog_id, top_thread_message_id);
-    CHECK(topic_info != nullptr);
-  }
-
+  auto topic_info = add_topic_info(dialog_id, std::move(forum_topic_info));
+  CHECK(topic_info != nullptr);
   promise.set_value(topic_info->get_forum_topic_info_object(td_));
 }
 
@@ -290,6 +281,25 @@ Status ForumTopicManager::is_forum(DialogId dialog_id) {
   return Status::OK();
 }
 
+ForumTopicInfo *ForumTopicManager::add_topic_info(DialogId dialog_id, unique_ptr<ForumTopicInfo> &&forum_topic_info) {
+  CHECK(forum_topic_info != nullptr);
+  auto *dialog_info = dialog_topics_.get_pointer(dialog_id);
+  if (dialog_info == nullptr) {
+    dialog_topics_.set(dialog_id, make_unique<DialogTopics>());
+    dialog_info = dialog_topics_.get_pointer(dialog_id);
+    CHECK(dialog_info != nullptr);
+  }
+
+  MessageId top_thread_message_id = forum_topic_info->get_thread_id();
+  auto topic_info = dialog_info->topic_infos_.get_pointer(top_thread_message_id);
+  if (topic_info == nullptr) {
+    dialog_info->topic_infos_.set(top_thread_message_id, std::move(forum_topic_info));
+    topic_info = get_topic_info(dialog_id, top_thread_message_id);
+    CHECK(topic_info != nullptr);
+  }
+  return topic_info;
+}
+
 ForumTopicInfo *ForumTopicManager::get_topic_info(DialogId dialog_id, MessageId top_thread_message_id) {
   auto *dialog_info = dialog_topics_.get_pointer(dialog_id);
   if (dialog_info == nullptr) {
diff --git a/td/telegram/ForumTopicManager.h b/td/telegram/ForumTopicManager.h
index a7aa66083..d89bcc252 100644
--- a/td/telegram/ForumTopicManager.h
+++ b/td/telegram/ForumTopicManager.h
@@ -57,6 +57,8 @@ class ForumTopicManager final : public Actor {
 
   Status is_forum(DialogId dialog_id);
 
+  ForumTopicInfo *add_topic_info(DialogId dialog_id, unique_ptr<ForumTopicInfo> &&forum_topic_info);
+
   ForumTopicInfo *get_topic_info(DialogId dialog_id, MessageId top_thread_message_id);
 
   const ForumTopicInfo *get_topic_info(DialogId dialog_id, MessageId top_thread_message_id) const;