diff --git a/components/core/src/clp/BufferReader.cpp b/components/core/src/clp/BufferReader.cpp
index b0f8f2fb2..fcab79df1 100644
--- a/components/core/src/clp/BufferReader.cpp
+++ b/components/core/src/clp/BufferReader.cpp
@@ -60,6 +60,11 @@ auto BufferReader::try_read(char* buf, size_t num_bytes_to_read, size_t& num_byt
         throw OperationFailed(ErrorCode_BadParam, __FILENAME__, __LINE__);
     }
 
+    if (0 == num_bytes_to_read) {
+        num_bytes_read = 0;
+        return ErrorCode_Success;
+    }
+
     auto remaining_data_size = get_remaining_data_size();
     if (0 == remaining_data_size) {
         return ErrorCode_EndOfFile;