diff --git a/src/intel/compiler/jay/jay_lower_scoreboard.c b/src/intel/compiler/jay/jay_lower_scoreboard.c
index a79cfb22e29..c40055d5b30 100644
--- a/src/intel/compiler/jay/jay_lower_scoreboard.c
+++ b/src/intel/compiler/jay/jay_lower_scoreboard.c
@@ -383,7 +383,7 @@ lower_regdist(jay_function *func, jay_inst *I, struct swsb_state *ctx)
                               last_pipe == TGL_PIPE_FLOAT ||
                               last_pipe == TGL_PIPE_INT) ?
                  last_pipe :
-                 TGL_PIPE_ALL,
+                 wait_pipes ? TGL_PIPE_ALL : TGL_PIPE_NONE,
    };
 
    /* Fold the immediate preceding SYNC.nop into this instruction, allowing