diff --git a/oslo/messaging/_drivers/amqpdriver.py b/oslo/messaging/_drivers/amqpdriver.py
index 6cd35bb03..b68ae3e56 100644
--- a/oslo/messaging/_drivers/amqpdriver.py
+++ b/oslo/messaging/_drivers/amqpdriver.py
@@ -119,9 +119,8 @@ class ReplyWaiters(object):
             queue.put(message_data)
 
     def wake_all(self, except_id):
-        for msg_id in self._queues:
-            if msg_id == except_id:
-                continue
+        msg_ids = [i for i in self._queues if i != except_id]
+        for msg_id in msg_ids:
             self.put(msg_id, None)
 
     def add(self, msg_id, queue):