diff --git a/source/client/src/clientRawBlockWrite.c b/source/client/src/clientRawBlockWrite.c
index ec748d0270..4188d84573 100644
--- a/source/client/src/clientRawBlockWrite.c
+++ b/source/client/src/clientRawBlockWrite.c
@@ -1630,7 +1630,7 @@ static int32_t tmqWriteRawDataImpl(TAOS* taos, void* data, int32_t dataLen) {
 
   int8_t dataVersion = *(int8_t*)data;
   if (dataVersion >= MQ_DATA_RSP_VERSION){
-    data += sizeof(int8_t) + sizeof(int32_t);
+    data = POINTER_SHIFT(data, sizeof(int8_t) + sizeof(int32_t));
     dataLen -= sizeof(int8_t) + sizeof(int32_t);
   }
   tDecoderInit(&decoder, data, dataLen);
@@ -1764,7 +1764,7 @@ static int32_t tmqWriteRawMetaDataImpl(TAOS* taos, void* data, int32_t dataLen)
 
   int8_t dataVersion = *(int8_t*)data;
   if (dataVersion >= MQ_DATA_RSP_VERSION){
-    data += sizeof(int8_t) + sizeof(int32_t);
+    data = POINTER_SHIFT(data, sizeof(int8_t) + sizeof(int32_t));
     dataLen -= sizeof(int8_t) + sizeof(int32_t);
   }
 
diff --git a/tests/system-test/7-tmq/tmq_primary_key.py b/tests/system-test/7-tmq/tmq_primary_key.py
index 44de5466a8..8f62dc8783 100644
--- a/tests/system-test/7-tmq/tmq_primary_key.py
+++ b/tests/system-test/7-tmq/tmq_primary_key.py
@@ -81,6 +81,8 @@ class TDTestCase:
         finally:
             consumer.close()
 
+        time.sleep(4)  # wait for heart beat
+
         tdSql.query(f'show subscriptions;')
         sub = tdSql.getData(0, 4);
         print(sub)
@@ -190,6 +192,7 @@ class TDTestCase:
         finally:
             consumer.close()
 
+        time.sleep(4)  # wait for heart beat
         tdSql.query(f'show subscriptions;')
         sub = tdSql.getData(0, 4);
         print(sub)
@@ -298,6 +301,7 @@ class TDTestCase:
         finally:
             consumer.close()
 
+        time.sleep(4)  # wait for heart beat
         tdSql.query(f'show subscriptions;')
         sub = tdSql.getData(0, 4);
         print(sub)
@@ -406,6 +410,7 @@ class TDTestCase:
         finally:
             consumer.close()
 
+        time.sleep(4)  # wait for heart beat
         tdSql.query(f'show subscriptions;')
         sub = tdSql.getData(0, 4);
         print(sub)