diff --git a/src/iperf_udp.c b/src/iperf_udp.c
index a603236df..40f2b1ca7 100644
--- a/src/iperf_udp.c
+++ b/src/iperf_udp.c
@@ -446,6 +446,7 @@ iperf_udp_accept(struct iperf_test *test)
     /*
      * Create a new "listening" socket to replace the one we were using before.
      */
+    FD_CLR(test->prot_listener, &test->read_set); // No control messages from old listener
     test->prot_listener = netannounce(test->settings->domain, Pudp, test->bind_address, test->bind_dev, test->server_port);
     if (test->prot_listener < 0) {
         i_errno = IESTREAMLISTEN;