diff --git a/renderdoc/driver/d3d11/d3d11_debug.cpp b/renderdoc/driver/d3d11/d3d11_debug.cpp
index 0f373a997..b05351e8f 100644
--- a/renderdoc/driver/d3d11/d3d11_debug.cpp
+++ b/renderdoc/driver/d3d11/d3d11_debug.cpp
@@ -1990,6 +1990,12 @@ void D3D11DebugManager::GetBufferData(ID3D11Buffer *buffer, uint64_t offset, uin
   D3D11_BUFFER_DESC desc;
   buffer->GetDesc(&desc);
 
+  if(offs >= desc.ByteWidth)
+  {
+    // can't read past the end of the buffer, return empty
+    return;
+  }
+
   if(len == 0)
   {
     len = desc.ByteWidth - offs;
@@ -1997,7 +2003,8 @@ void D3D11DebugManager::GetBufferData(ID3D11Buffer *buffer, uint64_t offset, uin
 
   if(len > 0 && offs + len > desc.ByteWidth)
   {
-    RDCWARN("Attempting to read off the end of the array. Will be clamped");
+    RDCWARN("Attempting to read off the end of the buffer (%llu %llu). Will be clamped (%u)",
+            offset, length, desc.ByteWidth);
     len = RDCMIN(len, desc.ByteWidth - offs);
   }
 
diff --git a/renderdoc/driver/gl/gl_replay.cpp b/renderdoc/driver/gl/gl_replay.cpp
index b1151efe0..7e14f4f1e 100644
--- a/renderdoc/driver/gl/gl_replay.cpp
+++ b/renderdoc/driver/gl/gl_replay.cpp
@@ -369,12 +369,13 @@ void GLReplay::GetBufferData(ResourceId buff, uint64_t offset, uint64_t len, vec
 
   uint64_t bufsize = buf.size;
 
-  if(len > 0 && offset + len > buf.size)
+  if(len > 0 && offset + len > bufsize)
   {
-    RDCWARN("Attempting to read off the end of the array. Will be clamped");
+    RDCWARN("Attempting to read off the end of the buffer (%llu %llu). Will be clamped (%llu)",
+            offset, len, bufsize);
 
-    if(offset < buf.size)
-      len = ~0ULL;    // min below will clamp to max size size
+    if(offset < bufsize)
+      len = ~0ULL;    // min below will clamp to max size
     else
       return;    // offset past buffer size, return empty array
   }
diff --git a/renderdoc/driver/vulkan/vk_debug.cpp b/renderdoc/driver/vulkan/vk_debug.cpp
index 61aaf4770..be492b057 100644
--- a/renderdoc/driver/vulkan/vk_debug.cpp
+++ b/renderdoc/driver/vulkan/vk_debug.cpp
@@ -3334,15 +3334,24 @@ void VulkanDebugManager::GetBufferData(ResourceId buff, uint64_t offset, uint64_
     return;
   }
 
-  if(len == 0)
+  uint64_t bufsize = m_pDriver->m_CreationInfo.m_Buffer[buff].size;
+
+  if(offset >= bufsize)
   {
-    len = m_pDriver->m_CreationInfo.m_Buffer[buff].size - offset;
+    // can't read past the end of the buffer, return empty
+    return;
   }
 
-  if(len > 0 && VkDeviceSize(offset + len) > m_pDriver->m_CreationInfo.m_Buffer[buff].size)
+  if(len == 0)
   {
-    RDCWARN("Attempting to read off the end of the array. Will be clamped");
-    len = RDCMIN(len, m_pDriver->m_CreationInfo.m_Buffer[buff].size - offset);
+    len = bufsize - offset;
+  }
+
+  if(len > 0 && VkDeviceSize(offset + len) > bufsize)
+  {
+    RDCWARN("Attempting to read off the end of the buffer (%llu %llu). Will be clamped (%llu)",
+            offset, len, bufsize);
+    len = RDCMIN(len, bufsize - offset);
   }
 
   ret.resize((size_t)len);