diff --git a/renderdoc/driver/vulkan/vk_dispatchtables.cpp b/renderdoc/driver/vulkan/vk_dispatchtables.cpp
index f5e9f5f6d..372d35ed0 100644
--- a/renderdoc/driver/vulkan/vk_dispatchtables.cpp
+++ b/renderdoc/driver/vulkan/vk_dispatchtables.cpp
@@ -65,7 +65,10 @@ void InitInstanceReplayTables(VkInstance instance)
 	// we know we'll only have one instance, so this is safe
 	
 #define InstanceGPA(func) table->func = (CONCAT(PFN_vk, func))table->GetInstanceProcAddr(instance, STRINGIZE(CONCAT(vk, func)));
-
+	
+	InstanceGPA(GetPhysicalDeviceSurfaceCapabilitiesKHR)
+	InstanceGPA(GetPhysicalDeviceSurfaceFormatsKHR)
+	InstanceGPA(GetPhysicalDeviceSurfacePresentModesKHR)
 	InstanceGPA(GetPhysicalDeviceSurfaceSupportKHR)
 	InstanceGPA(DbgCreateMsgCallback)
 	InstanceGPA(DbgDestroyMsgCallback)
@@ -82,9 +85,6 @@ void InitDeviceReplayTables(VkDevice device)
 
 #define DeviceGPA(func) table->func = (CONCAT(PFN_vk, func))table->GetDeviceProcAddr(device, STRINGIZE(CONCAT(vk, func)));
 	
-	DeviceGPA(GetSurfacePropertiesKHR)
-	DeviceGPA(GetSurfaceFormatsKHR)
-	DeviceGPA(GetSurfacePresentModesKHR)
 	DeviceGPA(CreateSwapchainKHR)
 	DeviceGPA(DestroySwapchainKHR)
 	DeviceGPA(GetSwapchainImagesKHR)
diff --git a/renderdoc/driver/vulkan/vk_hookset_defs.h b/renderdoc/driver/vulkan/vk_hookset_defs.h
index 8baad5386..8be393236 100644
--- a/renderdoc/driver/vulkan/vk_hookset_defs.h
+++ b/renderdoc/driver/vulkan/vk_hookset_defs.h
@@ -37,7 +37,10 @@
 	HookInit(GetPhysicalDeviceMemoryProperties); \
 	HookInit(DbgCreateMsgCallback); \
 	HookInit(DbgDestroyMsgCallback); \
-	HookInit(GetPhysicalDeviceSurfaceSupportKHR)
+	HookInit(GetPhysicalDeviceSurfaceSupportKHR); \
+	HookInit(GetPhysicalDeviceSurfaceCapabilitiesKHR); \
+	HookInit(GetPhysicalDeviceSurfaceFormatsKHR); \
+	HookInit(GetPhysicalDeviceSurfacePresentModesKHR); \
 
 #define HookInitVulkanDevice() \
 	HookInit(CreateDevice); \
@@ -161,9 +164,6 @@
 	HookInit(CmdNextSubpass); \
 	HookInit(CmdExecuteCommands); \
 	HookInit(CmdEndRenderPass); \
-	HookInit(GetPhysicalDeviceSurfaceCapabilitiesKHR); \
-	HookInit(GetPhysicalDeviceSurfaceFormatsKHR); \
-	HookInit(GetPhysicalDeviceSurfacePresentModesKHR); \
 	HookInit(CreateSwapchainKHR); \
 	HookInit(DestroySwapchainKHR); \
 	HookInit(GetSwapchainImagesKHR); \