diff --git a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp
index ad8ad44cf..1f842b1f6 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp
@@ -768,10 +768,10 @@ VkResult WrappedVulkan::vkCreateDevice(
 	// (note that we asserted above that there was nothing else in the chain)
 	createInfo.pNext = NULL;
 
-	InitDeviceTable(*pDevice, gdpa);
-
 	if(ret == VK_SUCCESS)
 	{
+		InitDeviceTable(*pDevice, gdpa);
+
 		ResourceId id = GetResourceManager()->WrapResource(*pDevice, *pDevice);
 		
 		if(m_State >= WRITING)