diff --git a/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java
index e85cbafc48..08a7d80e75 100644
--- a/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java
+++ b/activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java
@@ -211,7 +211,7 @@ public class TcpTransport extends TransportThreadSupport implements Transport, S
         LOG.trace("TCP consumer thread for " + this + " starting");
         this.runnerThread=Thread.currentThread();
         try {
-            while (!isStopped()) {
+            while (!isStopped() && !isStopping()) {
                 doRun();
             }
         } catch (IOException e) {