diff --git a/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java b/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java
index 530b8f0..f8f5f0a 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java
@@ -332,13 +332,16 @@
                         {
                             clearSelecting();
                         }
-                        _workQueue.addAll(connections);
-                        _workQueue.add(this);
-                        for (ConnectionProcessor connectionProcessor : connections)
-                        {
-                            connectionProcessor.processConnection();
-                        }
 
+                        if (!connections.isEmpty())
+                        {
+                            _workQueue.addAll(connections);
+                            _workQueue.add(this);
+                            for (ConnectionProcessor connectionProcessor : connections)
+                            {
+                                connectionProcessor.processConnection();
+                            }
+                        }
                     }
                     else
                     {