diff --git a/src/dxvk/dxvk_context.cpp b/src/dxvk/dxvk_context.cpp
index ee71c14b..a7a65910 100644
--- a/src/dxvk/dxvk_context.cpp
+++ b/src/dxvk/dxvk_context.cpp
@@ -64,7 +64,7 @@ namespace dxvk {
   
   
   void DxvkContext::beginQuery(const DxvkQueryRevision& query) {
-    DxvkQueryHandle handle; // TODO = allocateQuery(...)
+    DxvkQueryHandle handle = this->allocateQuery(query);
     
     m_cmd->cmdBeginQuery(
       handle.queryPool,
@@ -1602,6 +1602,13 @@ namespace dxvk {
   }
   
   
+    
+  DxvkQueryHandle DxvkContext::allocateQuery(const DxvkQueryRevision& query) {
+    // TODO implement
+    return DxvkQueryHandle { };
+  }
+  
+  
   void DxvkContext::resetQueryPool(const Rc<DxvkQueryPool>& pool) {
     this->renderPassEnd();
     
@@ -1613,7 +1620,7 @@ namespace dxvk {
   
   void DxvkContext::beginActiveQueries() {
     for (const DxvkQueryRevision& query : m_activeQueries) {
-      DxvkQueryHandle handle; // TODO = allocateQuery(...)
+      DxvkQueryHandle handle = this->allocateQuery(query);
       
       m_cmd->cmdBeginQuery(
         handle.queryPool,
diff --git a/src/dxvk/dxvk_context.h b/src/dxvk/dxvk_context.h
index f36f9348..e0d88e0f 100644
--- a/src/dxvk/dxvk_context.h
+++ b/src/dxvk/dxvk_context.h
@@ -595,6 +595,9 @@ namespace dxvk {
     
     void commitComputeBarriers();
     
+    DxvkQueryHandle allocateQuery(
+      const DxvkQueryRevision& query);
+    
     void resetQueryPool(
       const Rc<DxvkQueryPool>& pool);