diff --git a/renderdoc/driver/vulkan/vk_shaderdebug.cpp b/renderdoc/driver/vulkan/vk_shaderdebug.cpp
index f33489d11..59bdc25ad 100644
--- a/renderdoc/driver/vulkan/vk_shaderdebug.cpp
+++ b/renderdoc/driver/vulkan/vk_shaderdebug.cpp
@@ -36,6 +36,8 @@
 
 RDOC_DEBUG_CONFIG(rdcstr, Vulkan_Debug_PSDebugDumpDirPath, "",
                   "Path to dump before and after pixel shader input SPIR-V files.");
+RDOC_DEBUG_CONFIG(bool, Vulkan_Debug_DisableBufferDeviceAddress, false,
+                  "Disable use of buffer device address for PS Input fetch.");
 
 class VulkanAPIWrapper : public rdcspv::DebugAPIWrapper
 {
@@ -1163,6 +1165,9 @@ ShaderDebugTrace *VulkanReplay::DebugPixel(uint32_t eventId, uint32_t x, uint32_
       storageMode = EXT_bda;
   }
 
+  if(Vulkan_Debug_DisableBufferDeviceAddress)
+    storageMode = Binding;
+
   rdcarray<uint32_t> fragspv = shader.spirv.GetSPIRV();
 
   if(!Vulkan_Debug_PSDebugDumpDirPath.empty())