diff --git a/renderdoc/driver/vulkan/vk_info.cpp b/renderdoc/driver/vulkan/vk_info.cpp
index d0948a500..7952177b4 100644
--- a/renderdoc/driver/vulkan/vk_info.cpp
+++ b/renderdoc/driver/vulkan/vk_info.cpp
@@ -876,6 +876,14 @@ void VulkanCreationInfo::Buffer::Init(VulkanResourceManager *resourceMan, Vulkan
 {
   usage = pCreateInfo->usage;
   size = pCreateInfo->size;
+
+  const VkBufferDeviceAddressCreateInfoEXT *deviceAddress =
+      (const VkBufferDeviceAddressCreateInfoEXT *)FindNextStruct(
+          pCreateInfo, VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_CREATE_INFO_EXT);
+  if(deviceAddress)
+    gpuAddress = deviceAddress->deviceAddress;
+  else
+    gpuAddress = 0;
 }
 
 void VulkanCreationInfo::BufferView::Init(VulkanResourceManager *resourceMan,
diff --git a/renderdoc/driver/vulkan/vk_info.h b/renderdoc/driver/vulkan/vk_info.h
index 3de426d32..7c0c06b9b 100644
--- a/renderdoc/driver/vulkan/vk_info.h
+++ b/renderdoc/driver/vulkan/vk_info.h
@@ -414,6 +414,7 @@ struct VulkanCreationInfo
 
     VkBufferUsageFlags usage;
     uint64_t size;
+    uint64_t gpuAddress;
   };
   std::map<ResourceId, Buffer> m_Buffer;