diff --git a/crates/arroyo-operator/src/operator.rs b/crates/arroyo-operator/src/operator.rs
index 179d8dcc9..d34eaf4ff 100644
--- a/crates/arroyo-operator/src/operator.rs
+++ b/crates/arroyo-operator/src/operator.rs
@@ -919,7 +919,7 @@ async fn operator_run_behavior(
                 }
             }
 
-            p = sel.next() => {
+            p = sel.next(), if !shutdown_after_commit => {
                 match p {
                     Some(((idx, message), s)) => {
                         let local_idx = idx;