diff --git a/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp b/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp
index 0cc158ae4..602f94f3c 100644
--- a/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp
+++ b/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp
@@ -4243,8 +4243,6 @@ bool WrappedID3D12GraphicsCommandList::Serialise_ExecuteIndirect(
 
       if(MaxCommandCount > 1 || comSig->sig.numDraws > 1)
         draw.flags |= DrawFlags::PushMarker;
-      else
-        draw.flags |= DrawFlags::SetMarker;
 
       m_Cmd->AddDrawcall(draw, true);
 
diff --git a/renderdoc/driver/gl/wrappers/gl_draw_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_draw_funcs.cpp
index c8e01d525..dddb38ed1 100644
--- a/renderdoc/driver/gl/wrappers/gl_draw_funcs.cpp
+++ b/renderdoc/driver/gl/wrappers/gl_draw_funcs.cpp
@@ -4763,7 +4763,7 @@ bool WrappedOpenGL::Serialise_glFlush(SerialiserType &ser)
 
       DrawcallDescription draw;
       draw.name = ToStr(gl_CurChunk) + "()";
-      draw.flags |= DrawFlags::SetMarker;
+      draw.flags |= DrawFlags::PassBoundary | DrawFlags::EndPass;
 
       AddDrawcall(draw, true);
     }
@@ -4803,7 +4803,7 @@ bool WrappedOpenGL::Serialise_glFinish(SerialiserType &ser)
 
       DrawcallDescription draw;
       draw.name = ToStr(gl_CurChunk) + "()";
-      draw.flags |= DrawFlags::SetMarker;
+      draw.flags |= DrawFlags::PassBoundary | DrawFlags::EndPass;
 
       AddDrawcall(draw, true);
     }
diff --git a/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp
index dc29e4a4d..e0d29e327 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp
@@ -278,7 +278,7 @@ bool WrappedVulkan::Serialise_vkQueueSubmit(SerialiserType &ser, VkQueue queue,
           // add a fake marker
           DrawcallDescription draw;
           draw.name = name;
-          draw.flags |= DrawFlags::SetMarker;
+          draw.flags |= DrawFlags::PassBoundary | DrawFlags::BeginPass;
           AddEvent();
 
           m_RootEvents.back().chunkIndex = cmdBufInfo.beginChunk;
@@ -321,6 +321,7 @@ bool WrappedVulkan::Serialise_vkQueueSubmit(SerialiserType &ser, VkQueue queue,
           name = StringFormat::Fmt("=> %s[%u]: vkEndCommandBuffer(%s)", basename.c_str(), c,
                                    ToStr(cmd).c_str());
           draw.name = name;
+          draw.flags = DrawFlags::PassBoundary | DrawFlags::EndPass;
           AddEvent();
 
           m_RootEvents.back().chunkIndex = cmdBufInfo.endChunk;