diff --git a/clients/src/test/java/org/apache/kafka/common/network/NioEchoServer.java b/clients/src/test/java/org/apache/kafka/common/network/NioEchoServer.java
index 0c81b53742dd5..53f9d95a55a67 100644
--- a/clients/src/test/java/org/apache/kafka/common/network/NioEchoServer.java
+++ b/clients/src/test/java/org/apache/kafka/common/network/NioEchoServer.java
@@ -159,7 +159,6 @@ public void run() {
                 if (closeKafkaChannels) {
                     for (KafkaChannel channel : selector.channels())
                         selector.close(channel.id());
-                    closeKafkaChannels = false;
                 }
 
                 List<NetworkReceive> completedReceives = selector.completedReceives();
@@ -220,6 +219,8 @@ public void closeKafkaChannels() throws IOException {
             TestUtils.waitForCondition(() -> selector.channels().isEmpty(), "Channels not closed");
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
+        } finally {
+            closeKafkaChannels = false;
         }
     }