diff --git a/src/nouveau/compiler/nak_from_nir.rs b/src/nouveau/compiler/nak_from_nir.rs
index 5137288c31f..325cbf7567b 100644
--- a/src/nouveau/compiler/nak_from_nir.rs
+++ b/src/nouveau/compiler/nak_from_nir.rs
@@ -1867,6 +1867,7 @@ impl<'a> ShaderFromNir<'a> {
                     SCOPE_WORKGROUP => {
                         if self.nir.info.stage() == MESA_SHADER_COMPUTE {
                             b.push_op(OpBar {}).deps.yld = true;
+                            b.push_op(OpNop { label: None });
                         }
                     }
                     _ => panic!("Unhandled execution scope"),
diff --git a/src/nouveau/compiler/nak_ir.rs b/src/nouveau/compiler/nak_ir.rs
index 2bf87606b34..31a1d005ee2 100644
--- a/src/nouveau/compiler/nak_ir.rs
+++ b/src/nouveau/compiler/nak_ir.rs
@@ -4590,6 +4590,7 @@ impl Instr {
             | Op::CCtl(_)
             | Op::MemBar(_)
             | Op::Kill(_)
+            | Op::Nop(_)
             | Op::Break(_)
             | Op::BSSy(_)
             | Op::BSync(_)
@@ -4601,7 +4602,6 @@ impl Instr {
             | Op::Out(_)
             | Op::OutFinal(_) => false,
             Op::BMov(op) => !op.clear,
-            Op::Nop(op) => op.label.is_none(),
             _ => true,
         }
     }