diff --git a/src/wal/src/walWrite.c b/src/wal/src/walWrite.c
index 2dfdb8481834063cad8b351fa2487eeeee48e39a..7523369dc2ba3cb91a99201a0c45a295d490801b 100644
--- a/src/wal/src/walWrite.c
+++ b/src/wal/src/walWrite.c
@@ -309,36 +309,63 @@ static int32_t walSkipCorruptedRecord(SWal *pWal, SWalHead *pHead, int64_t tfd,
 }
 // Add SMemRowType ahead of SDataRow
 static void expandSubmitBlk(SSubmitBlk *pDest, SSubmitBlk *pSrc, int32_t *lenExpand) {
+  // copy the header firstly
   memcpy(pDest, pSrc, sizeof(SSubmitBlk));
-  int nRows = htons(pSrc->numOfRows);
-  if (nRows <= 0) {
+
+  int32_t nRows = htons(pDest->numOfRows);
+  int32_t dataLen = htonl(pDest->dataLen);
+
+  if ((nRows <= 0) || (dataLen <= 0)) {
     return;
   }
+
   char *pDestData = pDest->data;
   char *pSrcData = pSrc->data;
-  for (int i = 0; i < nRows; ++i) {
+  for (int32_t i = 0; i < nRows; ++i) {
     memRowSetType(pDestData, SMEM_ROW_DATA);
     memcpy(memRowDataBody(pDestData), pSrcData, dataRowLen(pSrcData));
     pDestData = POINTER_SHIFT(pDestData, memRowTLen(pDestData));
     pSrcData = POINTER_SHIFT(pSrcData, dataRowLen(pSrcData));
     ++(*lenExpand);
   }
-  int32_t dataLen = htonl(pDest->dataLen);
   pDest->dataLen = htonl(dataLen + nRows * sizeof(uint8_t));
 }
 
+// Check SDataRow by comparing the SDataRow len and SSubmitBlk dataLen
 static bool walIsSDataRow(void *pBlkData, int nRows, int32_t dataLen) {
-  int32_t len = 0;
+  if ((nRows <= 0) || (dataLen <= 0)) {
+    return true;
+  }
+  int32_t len = 0, kvLen = 0;
   for (int i = 0; i < nRows; ++i) {
     len += dataRowLen(pBlkData);
     if (len > dataLen) {
       return false;
     }
+
+    /**
+     * For SDataRow between version [2.1.5.0 and 2.1.6.X], it would never conflict.
+     * For SKVRow between version [2.1.5.0 and 2.1.6.X], it may conflict in below scenario
+     *   -  with 1st type byte 0x01 and sversion  0x0101(257), thus do further check
+     */
+    if (dataRowLen(pBlkData) == 257) {
+      SMemRow  memRow = pBlkData;
+      SKVRow   kvRow = memRowKvBody(memRow);
+      int      nCols = kvRowNCols(kvRow);
+      uint16_t calcTsOffset = (uint16_t)(TD_MEM_ROW_KV_HEAD_SIZE + sizeof(SColIdx) * nCols);
+      uint16_t realTsOffset = (kvRowColIdx(kvRow))->offset;
+      if (calcTsOffset == realTsOffset) {
+        kvLen += memRowKvTLen(memRow);
+      }
+    }
     pBlkData = POINTER_SHIFT(pBlkData, dataRowLen(pBlkData));
   }
   if (len != dataLen) {
     return false;
   }
+  if (kvLen == dataLen) {
+    return false;
+  }
   return true;
 }
 // for WAL SMemRow/SDataRow compatibility