diff --git a/src/panfrost/lib/pan_indirect_dispatch.c b/src/panfrost/lib/pan_indirect_dispatch.c
index e4d521c8864..614d1acb31b 100644
--- a/src/panfrost/lib/pan_indirect_dispatch.c
+++ b/src/panfrost/lib/pan_indirect_dispatch.c
@@ -181,10 +181,6 @@ GENX(pan_indirect_dispatch_init)(struct panfrost_device *dev)
 
         mali_ptr address = dev->indirect_dispatch.bin->ptr.gpu;
 
-#if PAN_ARCH <= 5
-        address |= shader_info.midgard.first_tag;
-#endif
-
         void *rsd = dev->indirect_dispatch.descs->ptr.cpu;
         pan_pack(rsd, RENDERER_STATE, cfg) {
                 pan_shader_prepare_rsd(&shader_info, address, &cfg);
diff --git a/src/panfrost/lib/pan_indirect_draw.c b/src/panfrost/lib/pan_indirect_draw.c
index c335349e50a..befdf3a2041 100644
--- a/src/panfrost/lib/pan_indirect_draw.c
+++ b/src/panfrost/lib/pan_indirect_draw.c
@@ -1146,10 +1146,6 @@ create_indirect_draw_shader(struct panfrost_device *dev,
                                                 binary.data, binary.size,
                                                 PAN_ARCH >= 6 ? 128 : 64);
 
-#if PAN_ARCH <= 5
-                address |= shader_info.midgard.first_tag;
-#endif
-
                 util_dynarray_fini(&binary);
 
                 pan_pack(state, RENDERER_STATE, cfg) {