diff --git a/src/broadcom/compiler/qpu_schedule.c b/src/broadcom/compiler/qpu_schedule.c
index 307bd21dbae..ba76ac87e1e 100644
--- a/src/broadcom/compiler/qpu_schedule.c
+++ b/src/broadcom/compiler/qpu_schedule.c
@@ -2032,8 +2032,12 @@ qpu_inst_before_thrsw_valid_in_delay_slot(struct v3d_compile *c,
          * thread.  The simulator complains for safety, though it
          * would only occur for dead code in our case.
          */
-        if (slot > 0 && v3d_qpu_instr_is_legacy_sfu(&qinst->qpu))
-                return false;
+        if (slot > 0) {
+                if (c->devinfo->ver == 42 && v3d_qpu_instr_is_legacy_sfu(&qinst->qpu))
+                        return false;
+                if (c->devinfo->ver >= 71 && v3d_qpu_instr_is_sfu(&qinst->qpu))
+                        return false;
+        }
 
         if (qinst->qpu.sig.ldvary) {
                 if (c->devinfo->ver == 42 && slot > 0)