diff --git a/hazelcast/include/hazelcast/client/protocol/ClientMessage.h b/hazelcast/include/hazelcast/client/protocol/ClientMessage.h
index 349ca6561..e2ec8a489 100644
--- a/hazelcast/include/hazelcast/client/protocol/ClientMessage.h
+++ b/hazelcast/include/hazelcast/client/protocol/ClientMessage.h
@@ -1179,7 +1179,7 @@ class HAZELCAST_API ClientMessage
         bool isNull = (nullptr == value);
         if (isNull) {
             auto* h = reinterpret_cast<frame_header_type*>(
-              wr_ptr(sizeof(frame_header_type)));
+              wr_ptr(SIZE_OF_FRAME_LENGTH_AND_FLAGS));
             *h = null_frame();
             if (is_final) {
                 h->flags |= IS_FINAL_FLAG;
@@ -1196,9 +1196,9 @@ class HAZELCAST_API ClientMessage
     inline void set(const std::string& value, bool is_final = false)
     {
         auto h = reinterpret_cast<frame_header_type*>(
-          wr_ptr(sizeof(frame_header_type)));
+          wr_ptr(SIZE_OF_FRAME_LENGTH_AND_FLAGS));
         auto len = value.length();
-        h->frame_len = sizeof(frame_header_type) + len;
+        h->frame_len = SIZE_OF_FRAME_LENGTH_AND_FLAGS + len;
         if (is_final) {
             h->flags |= IS_FINAL_FLAG;
         }
@@ -1286,7 +1286,7 @@ class HAZELCAST_API ClientMessage
     {
         if (value.data_size() == 0) {
             auto* h = reinterpret_cast<frame_header_type*>(
-              wr_ptr(sizeof(frame_header_type)));
+              wr_ptr(SIZE_OF_FRAME_LENGTH_AND_FLAGS));
             *h = null_frame();
             if (is_final) {
                 h->flags |= IS_FINAL_FLAG;
@@ -1294,7 +1294,7 @@ class HAZELCAST_API ClientMessage
             return;
         }
         auto& bytes = value.to_byte_array();
-        auto frame_length = sizeof(frame_header_type) + bytes.size();
+        auto frame_length = SIZE_OF_FRAME_LENGTH_AND_FLAGS + bytes.size();
         auto fp = wr_ptr(frame_length);
         auto* header = reinterpret_cast<frame_header_type*>(fp);
         header->frame_len = frame_length;
@@ -1345,7 +1345,7 @@ class HAZELCAST_API ClientMessage
     void set(const std::vector<T>& values, bool is_final = false)
     {
         auto* h = reinterpret_cast<frame_header_type*>(
-          wr_ptr(sizeof(frame_header_type)));
+          wr_ptr(SIZE_OF_FRAME_LENGTH_AND_FLAGS));
         *h = begin_frame();
 
         for (auto& item : values) {
@@ -1353,7 +1353,7 @@ class HAZELCAST_API ClientMessage
         }
 
         h = reinterpret_cast<frame_header_type*>(
-          wr_ptr(sizeof(frame_header_type)));
+          wr_ptr(SIZE_OF_FRAME_LENGTH_AND_FLAGS));
         *h = end_frame();
         if (is_final) {
             h->flags |= IS_FINAL_FLAG;
@@ -1569,14 +1569,14 @@ class HAZELCAST_API ClientMessage
     void add_begin_frame()
     {
         auto* f = reinterpret_cast<frame_header_type*>(
-          wr_ptr(sizeof(frame_header_type)));
+          wr_ptr(SIZE_OF_FRAME_LENGTH_AND_FLAGS));
         *f = begin_frame();
     }
 
     void add_end_frame(bool is_final)
     {
         auto ef = reinterpret_cast<frame_header_type*>(
-          wr_ptr(sizeof(frame_header_type)));
+          wr_ptr(SIZE_OF_FRAME_LENGTH_AND_FLAGS));
         *ef = end_frame();
         if (is_final) {
             ef->flags |= IS_FINAL_FLAG;
diff --git a/hazelcast/src/hazelcast/client/protocol.cpp b/hazelcast/src/hazelcast/client/protocol.cpp
index b2b0021fb..c0e45928a 100644
--- a/hazelcast/src/hazelcast/client/protocol.cpp
+++ b/hazelcast/src/hazelcast/client/protocol.cpp
@@ -390,7 +390,7 @@ ClientMessage::fast_forward_to_end_frame()
     int number_expected_frames = 1;
     while (number_expected_frames) {
         auto* f = reinterpret_cast<frame_header_type*>(
-          rd_ptr(sizeof(frame_header_type)));
+          rd_ptr(SIZE_OF_FRAME_LENGTH_AND_FLAGS));
 
         int16_t flags = f->flags;
         if (is_flag_set(flags, END_DATA_STRUCTURE_FLAG)) {
@@ -400,7 +400,8 @@ ClientMessage::fast_forward_to_end_frame()
         }
 
         // skip current frame
-        rd_ptr(static_cast<int32_t>(f->frame_len) - sizeof(frame_header_type));
+        rd_ptr(static_cast<int32_t>(f->frame_len) -
+               SIZE_OF_FRAME_LENGTH_AND_FLAGS);
     }
 }