diff --git a/zio-kafka/src/main/scala/zio/kafka/consumer/internal/Runloop.scala b/zio-kafka/src/main/scala/zio/kafka/consumer/internal/Runloop.scala
index aa4823e9d..8648ef9b3 100644
--- a/zio-kafka/src/main/scala/zio/kafka/consumer/internal/Runloop.scala
+++ b/zio-kafka/src/main/scala/zio/kafka/consumer/internal/Runloop.scala
@@ -294,7 +294,6 @@ private[consumer] final class Runloop private (
                s" resuming ${partitionsToFetch} partitions"
            )
       _ <- currentStateRef.set(state)
-      _ <- lastRebalanceEvent.set(RebalanceEvent.None)
       pollResult <-
         consumer.runloopAccess { c =>
           ZIO.suspend {
@@ -317,7 +316,7 @@ private[consumer] final class Runloop private (
                 tpWithoutData = requestedPartitions -- providedTps
               )
             } *>
-              lastRebalanceEvent.get.flatMap {
+              lastRebalanceEvent.getAndSet(RebalanceEvent.None).flatMap {
                 case RebalanceEvent(false, _, _, _, _) =>
                   // The fast track, rebalance listener was not invoked:
                   //   no assignment changes, only new records.