diff --git a/conanfile.py b/conanfile.py
index b5f6e83f8..eb39c8666 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -5,7 +5,7 @@
 
 class HomestoreConan(ConanFile):
     name = "homestore"
-    version = "6.4.24"
+    version = "6.4.25"
     homepage = "https://github.com/eBay/Homestore"
     description = "HomeStore Storage Engine"
     topics = ("ebay", "nublox")
@@ -31,7 +31,6 @@ class HomestoreConan(ConanFile):
                 'skip_testing': False,
             }
 
-
     generators = "cmake", "cmake_find_package"
     exports_sources = "cmake/*", "src/*", "CMakeLists.txt", "test_wrap.sh", "LICENSE"
     keep_imports = True
diff --git a/src/lib/replication/repl_dev/raft_repl_dev.cpp b/src/lib/replication/repl_dev/raft_repl_dev.cpp
index ac02e8cde..85885e071 100644
--- a/src/lib/replication/repl_dev/raft_repl_dev.cpp
+++ b/src/lib/replication/repl_dev/raft_repl_dev.cpp
@@ -249,6 +249,11 @@ void RaftReplDev::push_data_to_all_followers(repl_req_ptr_t rreq, sisl::sg_list
 
 void RaftReplDev::on_push_data_received(intrusive< sisl::GenericRpcData >& rpc_data) {
     auto const& incoming_buf = rpc_data->request_blob();
+    if (!incoming_buf.cbytes()) {
+        RD_LOGW("Data Channel: PushData received with empty buffer, ignoring this call");
+        rpc_data->send_response();
+        return;
+    }
     auto const fb_size =
         flatbuffers::ReadScalar< flatbuffers::uoffset_t >(incoming_buf.cbytes()) + sizeof(flatbuffers::uoffset_t);
     auto push_req = GetSizePrefixedPushDataRequest(incoming_buf.cbytes());
@@ -597,6 +602,11 @@ void RaftReplDev::fetch_data_from_remote(std::vector< repl_req_ptr_t > rreqs) {
 
 void RaftReplDev::on_fetch_data_received(intrusive< sisl::GenericRpcData >& rpc_data) {
     auto const& incoming_buf = rpc_data->request_blob();
+    if (!incoming_buf.cbytes()) {
+        RD_LOGW("Data Channel: PushData received with empty buffer, ignoring this call");
+        rpc_data->send_response();
+        return;
+    }
     auto fetch_req = GetSizePrefixedFetchData(incoming_buf.cbytes());
 
     RD_LOGD("Data Channel: FetchData received: fetch_req.size={}", fetch_req->request()->entries()->size());