diff --git a/renderdoc/replay/replay_renderer.cpp b/renderdoc/replay/replay_renderer.cpp
index 41189e5c1..becac8ad1 100644
--- a/renderdoc/replay/replay_renderer.cpp
+++ b/renderdoc/replay/replay_renderer.cpp
@@ -449,7 +449,7 @@ bool ReplayRenderer::GetHistogram(ResourceId tex, uint32_t sliceFace, uint32_t m
 bool ReplayRenderer::GetBufferData(ResourceId buff, uint64_t offset, uint64_t len,
                                    rdctype::array<byte> *data)
 {
-  if(data == NULL)
+  if(data == NULL || buff == ResourceId())
     return false;
 
   ResourceId liveId = m_pDevice->GetLiveID(buff);