diff --git a/td/telegram/Dependencies.cpp b/td/telegram/Dependencies.cpp
index e7d58f5b3..c878db850 100644
--- a/td/telegram/Dependencies.cpp
+++ b/td/telegram/Dependencies.cpp
@@ -85,8 +85,8 @@ bool resolve_dependencies_force(Td *td, const Dependencies &dependencies, const
     }
   }
   for (auto web_page_id : dependencies.web_page_ids) {
-    if (web_page_id.is_valid()) {
-      td->web_pages_manager_->have_web_page_force(web_page_id);
+    if (web_page_id.is_valid() && !td->web_pages_manager_->have_web_page_force(web_page_id)) {
+      LOG(INFO) << "Can't find " << web_page_id << " from " << source;
       success = false;
     }
   }
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 63407e177..1127ce990 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -31472,9 +31472,9 @@ MessagesManager::Message *MessagesManager::on_get_message_from_database(DialogId
 
   Dependencies dependencies;
   add_message_dependencies(dependencies, m.get());
-  if (!resolve_dependencies_force(td_, dependencies, "on_get_message_from_database")) {
-    FullMessageId full_message_id{dialog_id, m->message_id};
-    get_message_from_server(full_message_id, Auto(), "on_get_message_from_database 2");
+  if (!resolve_dependencies_force(td_, dependencies, "on_get_message_from_database") &&
+      dialog_id.get_type() != DialogType::SecretChat) {
+    get_message_from_server({dialog_id, m->message_id}, Auto(), "on_get_message_from_database 2");
   }
 
   m->have_previous = false;
diff --git a/td/telegram/WebPagesManager.cpp b/td/telegram/WebPagesManager.cpp
index 79076ac1b..8f4483b91 100644
--- a/td/telegram/WebPagesManager.cpp
+++ b/td/telegram/WebPagesManager.cpp
@@ -540,7 +540,7 @@ WebPageId WebPagesManager::on_get_web_page(tl_object_ptr<telegram_api::WebPage>
 
 void WebPagesManager::update_web_page(unique_ptr<WebPage> web_page, WebPageId web_page_id, bool from_binlog,
                                       bool from_database) {
-  LOG(INFO) << "Update " << web_page_id;
+  LOG(INFO) << "Update " << web_page_id << (from_database ? " from database" : (from_binlog ? " from binlog" : ""));
   CHECK(web_page != nullptr);
 
   auto &page = web_pages_[web_page_id];