diff --git a/icd/intel/queue.c b/icd/intel/queue.c
index 2a8fba1..d9c9e95 100644
--- a/icd/intel/queue.c
+++ b/icd/intel/queue.c
@@ -39,9 +39,6 @@
     struct intel_winsys *winsys = queue->dev->winsys;
     int err;
 
-    if (intel_debug & INTEL_DEBUG_BATCH)
-        intel_winsys_decode_bo(winsys, bo, used);
-
     if (intel_debug & INTEL_DEBUG_NOHW)
         err = 0;
     else
@@ -275,6 +272,9 @@
         ret = queue_submit_bo(queue, bo, used);
         queue->last_submitted_cmd = cmd;
 
+        if (intel_debug & INTEL_DEBUG_BATCH)
+            intel_cmd_decode(cmd);
+
         if (ret != XGL_SUCCESS)
             break;
     }