diff --git a/src/system/detail/src/vnodeSystem.c b/src/system/detail/src/vnodeSystem.c
index 631e258b2589aa548062e5661e937d7917665403..b23050ab03eeeeb9de329d7259da352d48fda23b 100644
--- a/src/system/detail/src/vnodeSystem.c
+++ b/src/system/detail/src/vnodeSystem.c
@@ -36,8 +36,14 @@ void vnodeCleanUpSystem() {
 
 bool vnodeInitQueryHandle() {
   int numOfThreads = tsRatioOfQueryThreads * tsNumOfCores * tsNumOfThreadsPerCore;
-  if (numOfThreads < 1) numOfThreads = 1;
-  queryQhandle = taosInitScheduler(tsNumOfVnodesPerCore * tsNumOfCores * tsSessionsPerVnode, numOfThreads, "query");
+  if (numOfThreads < 1) {
+    numOfThreads = 1;
+  }
+  
+  int32_t maxQueueSize = tsNumOfVnodesPerCore * tsNumOfCores * tsSessionsPerVnode;
+  dTrace("query task queue initialized, max slot:%d, task threads:%d", maxQueueSize,numOfThreads);
+  
+  queryQhandle = taosInitSchedulerWithInfo(maxQueueSize, numOfThreads, "query", vnodeTmrCtrl);
   return true;
 }
 
@@ -52,15 +58,15 @@ bool vnodeInitTmrCtl() {
 
 int vnodeInitSystem() {
 
-  if (!vnodeInitQueryHandle()) {
-    dError("failed to init query qhandle, exit");
-    return -1;
-  }
-
   if (!vnodeInitTmrCtl()) {
     dError("failed to init timer, exit");
     return -1;
   }
+  
+  if (!vnodeInitQueryHandle()) {
+    dError("failed to init query qhandle, exit");
+    return -1;
+  }
 
   if (vnodeInitStore() < 0) {
     dError("failed to init vnode storage");