diff --git a/src/amd/compiler/aco_insert_NOPs.cpp b/src/amd/compiler/aco_insert_NOPs.cpp
index 9c5b1c8b7c6..4302711ba81 100644
--- a/src/amd/compiler/aco_insert_NOPs.cpp
+++ b/src/amd/compiler/aco_insert_NOPs.cpp
@@ -218,9 +218,10 @@ int handle_raw_hazard_internal(Program *program, Block *block,
       if (is_hazard)
          return nops_needed;
 
+      mask &= ~writemask;
       nops_needed -= get_wait_states(pred);
 
-      if (nops_needed <= 0)
+      if (nops_needed <= 0 || mask == 0)
          return 0;
    }