diff --git a/source/client/src/clientMain.c b/source/client/src/clientMain.c
index 3683a0d454..f041e4b030 100644
--- a/source/client/src/clientMain.c
+++ b/source/client/src/clientMain.c
@@ -2201,7 +2201,7 @@ int taos_stmt2_bind_param(TAOS_STMT2 *stmt, TAOS_STMT2_BINDV *bindv, int32_t col
       if (code) {
         goto out;
       }
-    } else {
+    } else if (pStmt->bInfo.tbType == TSDB_CHILD_TABLE && pStmt->sql.autoCreateTbl) {
       code = stmtSetTbTags2(stmt, NULL);
       if (code) {
         return code;
diff --git a/source/dnode/vnode/src/tsdb/tsdbFS2.c b/source/dnode/vnode/src/tsdb/tsdbFS2.c
index fdc2ac4800..82dd49b0e2 100644
--- a/source/dnode/vnode/src/tsdb/tsdbFS2.c
+++ b/source/dnode/vnode/src/tsdb/tsdbFS2.c
@@ -803,7 +803,7 @@ int32_t tsdbDisableAndCancelAllBgTask(STsdb *pTsdb) {
       if (k == 0) {
         (void)vnodeACancel(task);
       } else {
-        (void)vnodeAWait(task);
+        vnodeAWait(task);
       }
     }
   }