diff --git a/source_common/trackers/queue.cpp b/source_common/trackers/queue.cpp
index 763dded..dc838b8 100644
--- a/source_common/trackers/queue.cpp
+++ b/source_common/trackers/queue.cpp
@@ -76,7 +76,12 @@ namespace
         {
             UNUSED(instruction);
 
-            queueState.debugStack.pop_back();
+            // Only pop if we have an earlier push - this shouldn't happen and
+            // is a validation violation, but not all apps handle this correctly
+            if (!queueState.debugStack.empty())
+            {
+                queueState.debugStack.pop_back();
+            }
         }
 
         /**