diff --git a/system/vulkan_enc/VkEncoder.cpp b/system/vulkan_enc/VkEncoder.cpp
index 28fa33b..5d96705 100644
--- a/system/vulkan_enc/VkEncoder.cpp
+++ b/system/vulkan_enc/VkEncoder.cpp
@@ -18605,9 +18605,11 @@
         healthMonitorAnnotation_packetContents.resize(watchdogBufSize);
         memcpy(&healthMonitorAnnotation_packetContents[0], packetBeginPtr, watchdogBufSize);
     }
+    stream->setHandleMapping(sResourceTracker->createMapping());
     uint64_t cgen_var_2;
     stream->read((uint64_t*)&cgen_var_2, 8);
     stream->handleMapping()->mapHandles_u64_VkQueue(&cgen_var_2, (VkQueue*)pQueue, 1);
+    stream->unsetHandleMapping();
     sResourceTracker->on_vkGetDeviceQueue2(this, device, pQueueInfo, pQueue);
     ++encodeCount;
     ;