diff --git a/src/gfxstream/codegen/scripts/cereal/encoder.py b/src/gfxstream/codegen/scripts/cereal/encoder.py
index 65a807740d6..141503a6e79 100644
--- a/src/gfxstream/codegen/scripts/cereal/encoder.py
+++ b/src/gfxstream/codegen/scripts/cereal/encoder.py
@@ -80,8 +80,6 @@ ENCODER_CUSTOM_RESOURCE_POSTPROCESS = [
     "vkCreateDescriptorUpdateTemplateKHR",
     "vkGetPhysicalDeviceExternalSemaphoreProperties",
     "vkGetPhysicalDeviceExternalSemaphorePropertiesKHR",
-    "vkGetDeviceQueue",
-    "vkGetDeviceQueue2",
 ]
 
 ENCODER_EXPLICIT_FLUSHED_APIS = [
diff --git a/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp b/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp
index de9837f48f4..ac0b44ec0e2 100644
--- a/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp
+++ b/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp
@@ -2240,18 +2240,6 @@ void ResourceTracker::on_vkGetPhysicalDeviceMemoryProperties2(
     on_vkGetPhysicalDeviceMemoryProperties(nullptr, physdev, &out->memoryProperties);
 }
 
-void ResourceTracker::on_vkGetDeviceQueue(void*, VkDevice device, uint32_t, uint32_t,
-                                          VkQueue* pQueue) {
-    std::lock_guard<std::recursive_mutex> lock(mLock);
-    info_VkQueue[*pQueue].device = device;
-}
-
-void ResourceTracker::on_vkGetDeviceQueue2(void*, VkDevice device, const VkDeviceQueueInfo2*,
-                                           VkQueue* pQueue) {
-    std::lock_guard<std::recursive_mutex> lock(mLock);
-    info_VkQueue[*pQueue].device = device;
-}
-
 VkResult ResourceTracker::on_vkCreateInstance(void* context, VkResult input_result,
                                               const VkInstanceCreateInfo* createInfo,
                                               const VkAllocationCallbacks*, VkInstance* pInstance) {
diff --git a/src/gfxstream/guest/vulkan_enc/ResourceTracker.h b/src/gfxstream/guest/vulkan_enc/ResourceTracker.h
index ea6e0ebcdbd..ee166cad9f9 100644
--- a/src/gfxstream/guest/vulkan_enc/ResourceTracker.h
+++ b/src/gfxstream/guest/vulkan_enc/ResourceTracker.h
@@ -178,10 +178,6 @@ class ResourceTracker {
     void on_vkGetPhysicalDeviceMemoryProperties2KHR(
         void* context, VkPhysicalDevice physicalDevice,
         VkPhysicalDeviceMemoryProperties2* pMemoryProperties);
-    void on_vkGetDeviceQueue(void* context, VkDevice device, uint32_t queueFamilyIndex,
-                             uint32_t queueIndex, VkQueue* pQueue);
-    void on_vkGetDeviceQueue2(void* context, VkDevice device, const VkDeviceQueueInfo2* pQueueInfo,
-                              VkQueue* pQueue);
 
     VkResult on_vkCreateInstance(void* context, VkResult input_result,
                                  const VkInstanceCreateInfo* createInfo,
@@ -825,7 +821,7 @@ class ResourceTracker {
     };
 
     struct VkQueue_Info {
-        VkDevice device;
+        uint32_t placeholder;
     };
 
     // custom guest-side structs for images/buffers because of AHardwareBuffer :((