diff --git a/renderdoc/driver/d3d12/d3d12_replay.cpp b/renderdoc/driver/d3d12/d3d12_replay.cpp
index c41f6da8d..8d617b1d9 100644
--- a/renderdoc/driver/d3d12/d3d12_replay.cpp
+++ b/renderdoc/driver/d3d12/d3d12_replay.cpp
@@ -2742,7 +2742,7 @@ rdcarray<uint32_t> D3D12Replay::GetPassEvents(uint32_t eventId)
   // store all the draw eventIDs up to the one specified at the start
   while(start)
   {
-    if(start == draw)
+    if(start->eventId >= draw->eventId)
       break;
 
     // include pass boundaries, these will be filtered out later
diff --git a/renderdoc/driver/vulkan/vk_replay.cpp b/renderdoc/driver/vulkan/vk_replay.cpp
index 97b6b7e37..7e237d32c 100644
--- a/renderdoc/driver/vulkan/vk_replay.cpp
+++ b/renderdoc/driver/vulkan/vk_replay.cpp
@@ -248,7 +248,7 @@ rdcarray<uint32_t> VulkanReplay::GetPassEvents(uint32_t eventId)
   // store all the draw eventIDs up to the one specified at the start
   while(start)
   {
-    if(start == draw)
+    if(start->eventId >= draw->eventId)
       break;
 
     // include pass boundaries, these will be filtered out later