diff --git a/source/libs/planner/src/planLogicCreater.c b/source/libs/planner/src/planLogicCreater.c
index c1793bfb90..c79fbd01f0 100644
--- a/source/libs/planner/src/planLogicCreater.c
+++ b/source/libs/planner/src/planLogicCreater.c
@@ -341,10 +341,11 @@ static int32_t addDefaultScanCol(const STableMeta* pMeta, SNodeList** pCols) {
   if (TSDB_SYSTEM_TABLE == pMeta->tableType) {
     return addSystableFirstCol(pMeta->uid, pMeta->schema, pCols, pMeta);
   }
-  if (hasPkInTable(pMeta)) {
-    addPkCol(pMeta->uid, pMeta->schema + 1, pCols, pMeta);
+  int32_t code = addPrimaryKeyCol(pMeta->uid, pMeta->schema, pCols, pMeta);
+  if (code == TSDB_CODE_SUCCESS && hasPkInTable(pMeta)) {
+    code = addPkCol(pMeta->uid, pMeta->schema + 1, pCols, pMeta);
   }
-  return addPrimaryKeyCol(pMeta->uid, pMeta->schema, pCols, pMeta);
+  return code;
 }
 
 static int32_t makeScanLogicNode(SLogicPlanContext* pCxt, SRealTableNode* pRealTable, bool hasRepeatScanFuncs,
diff --git a/tests/script/tsim/query/cache_last.sim b/tests/script/tsim/query/cache_last.sim
index 65eb46de69..50199117b0 100644
--- a/tests/script/tsim/query/cache_last.sim
+++ b/tests/script/tsim/query/cache_last.sim
@@ -89,7 +89,7 @@ if $data10 != @   -> Merge (columns=3 width=24 input_order=unknown output_order=
   return -1
 endi
 sql explain select count(*), last_row(f1), min(f1) from sta interval(1s);
-if $data10 != @   -> Merge (columns=4 width=66 input_order=asc output_order=asc mode=sort)@ then
+if $data10 != @   -> Merge (columns=4 width=82 input_order=asc output_order=asc mode=sort)@ then
   return -1
 endi
 sql explain select distinct count(*), last_row(f1), min(f1) from tba1;