diff --git a/qrenderdoc/Windows/BufferViewer.cpp b/qrenderdoc/Windows/BufferViewer.cpp
index 7718bea98..1396cfa4c 100644
--- a/qrenderdoc/Windows/BufferViewer.cpp
+++ b/qrenderdoc/Windows/BufferViewer.cpp
@@ -2563,7 +2563,8 @@ void BufferViewer::OnEventChanged(uint32_t eventId)
       uint64_t unclampedLen = m_ByteSize;
       if(unclampedLen == UINT64_MAX)
       {
-        uint64_t bufLen = m_IsBuffer ? m_Ctx.GetBuffer(m_BufferID)->length : 0;
+        uint64_t bufLen =
+            m_IsBuffer && m_BufferID != ResourceId() ? m_Ctx.GetBuffer(m_BufferID)->length : 0;
         uint64_t bufOffs = m_ByteOffset;
 
         if(bufOffs >= bufLen)