diff --git a/adnl/adnl-peer-table.hpp b/adnl/adnl-peer-table.hpp
index 1c30b84c7..1b61833f4 100644
--- a/adnl/adnl-peer-table.hpp
+++ b/adnl/adnl-peer-table.hpp
@@ -55,6 +55,10 @@ class AdnlPeerTableImpl : public AdnlPeerTable {
       VLOG(ADNL_WARNING) << "DUMP: " << td::buffer_to_hex(data.as_slice().truncate(128));
       return;
     }
+    if (data.empty()) {
+      send_message_in(src, dst, AdnlMessage{adnlmessage::AdnlMessageNop()}, flags);
+      return;
+    }
     send_message_in(src, dst, AdnlMessage{adnlmessage::AdnlMessageCustom{std::move(data)}}, flags);
   }
   void answer_query(AdnlNodeIdShort src, AdnlNodeIdShort dst, AdnlQueryId query_id, td::BufferSlice data) override;