diff --git a/src/dxvk/dxvk_gpu_query.cpp b/src/dxvk/dxvk_gpu_query.cpp
index 9f0b2938..8fdd428b 100644
--- a/src/dxvk/dxvk_gpu_query.cpp
+++ b/src/dxvk/dxvk_gpu_query.cpp
@@ -320,10 +320,9 @@ namespace dxvk {
       query);
     
     if (iter != m_activeQueries.end()) {
-      m_activeQueries.erase(iter);
-
       if (m_activeTypes & getQueryTypeBit((*iter)->type()))
         endSingleQuery(cmd, query);
+      m_activeQueries.erase(iter);
       
       query->end();
     }