diff --git a/search/src/main/java/org/zstack/query/QueryFacadeImpl.java b/search/src/main/java/org/zstack/query/QueryFacadeImpl.java
index 9bd8fa8c724..00c43997d01 100755
--- a/search/src/main/java/org/zstack/query/QueryFacadeImpl.java
+++ b/search/src/main/java/org/zstack/query/QueryFacadeImpl.java
@@ -349,7 +349,7 @@ private Method getReplySetter(AutoQuery at) {
         }
     }
 
-    private void handle(APIQueryMessage msg) {
+    private APIQueryReply doQuery(APIQueryMessage msg) {
         AutoQuery at = autoQueryMap.get(msg.getClass());
         if (at == null) {
             at = msg.getClass().getAnnotation(AutoQuery.class);
@@ -374,7 +374,7 @@ private void handle(APIQueryMessage msg) {
             if (result.inventories != null) {
                 replySetter.invoke(reply, result.inventories);
             }
-            bus.reply(msg, reply);
+            return reply;
         } catch (OperationFailureException of) {
             throw of;
         } catch (Exception e) {
@@ -382,6 +382,39 @@ private void handle(APIQueryMessage msg) {
         }
     }
 
+    private void handle(APIQueryMessage msg) {
+        thdf.syncSubmit(new SyncTask<Void>() {
+            @Override
+            public Void call() {
+                APIQueryReply reply;
+                try {
+                    reply = doQuery(msg);
+                } catch (OperationFailureException of) {
+                    reply = new APIQueryReply();
+                    reply.setError(of.getErrorCode());
+                }
+
+                bus.reply(msg, reply);
+                return null;
+            }
+
+            @Override
+            public String getName() {
+                return getSyncSignature();
+            }
+
+            @Override
+            public String getSyncSignature() {
+                return "api-query";
+            }
+
+            @Override
+            public int getSyncLevel() {
+                return getQuerySyncLevel();
+            }
+        });
+    }
+
     private String toZQLConditionString(QueryCondition c) {
         // make every condition value as string, the ZQL
         // will put them in right type because it knows every field's type