diff --git a/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp b/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp
index ac4886fa542..955f5b411ce 100644
--- a/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp
+++ b/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp
@@ -6815,7 +6815,7 @@ VkResult ResourceTracker::on_vkResetCommandBuffer(void* context, VkResult input_
     resetCommandBufferStagingInfo(commandBuffer, true /* also reset primaries */,
                                   true /* also clear pending descriptor sets */);
 
-    VkEncoder* enc = (VkEncoder*)context;
+    VkEncoder* enc = ResourceTracker::getCommandBufferEncoder(commandBuffer);
     (void)input_result;
 
     if (!supportsDeferredCommands()) {