diff --git a/renderdoc/driver/vulkan/vk_dispatchtables.cpp b/renderdoc/driver/vulkan/vk_dispatchtables.cpp
index 813f707e5..f514a4e45 100644
--- a/renderdoc/driver/vulkan/vk_dispatchtables.cpp
+++ b/renderdoc/driver/vulkan/vk_dispatchtables.cpp
@@ -111,6 +111,8 @@ void InitInstanceExtensionTables(VkInstance instance)
 
   InstanceDeviceInfo *info = GetRecord(instance)->instDevInfo;
 
+  instance = Unwrap(instance);
+
 #undef HookInitExtension
 #define HookInitExtension(ext, func) \
   if(info->ext)                      \
@@ -144,6 +146,8 @@ void InitDeviceExtensionTables(VkDevice device)
 
   InstanceDeviceInfo *info = GetRecord(device)->instDevInfo;
 
+  device = Unwrap(device);
+
 #undef HookInitExtension
 #define HookInitExtension(ext, func) \
   if(info->ext)                      \