diff --git a/src/compiler/nir/nir_divergence_analysis.c b/src/compiler/nir/nir_divergence_analysis.c
index 7ce64981fca..77f3732325c 100644
--- a/src/compiler/nir/nir_divergence_analysis.c
+++ b/src/compiler/nir/nir_divergence_analysis.c
@@ -1308,11 +1308,8 @@ visit_block(nir_block *block, struct divergence_state *state)
       }
    }
 
-   bool divergent = state->divergent_cf ||
-                    state->divergent_loop_continue ||
-                    state->divergent_loop_break;
-   if (divergent != block->divergent) {
-      block->divergent = divergent;
+   if (state->divergent_cf != block->divergent) {
+      block->divergent = state->divergent_cf;
       has_changed = true;
    }