diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java b/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
index 662645eb49..f06bd3ceb2 100755
--- a/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
+++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
@@ -1184,9 +1184,11 @@ public class ActiveMQConnection extends DefaultTransportListener implements Conn
             c.dispose();
         }
 
-        if( isConnectionInfoSentToBroker ) {
-            asyncSendPacket(info.createRemoveCommand());
-            isConnectionInfoSentToBroker = false;
+        if(isConnectionInfoSentToBroker){
+            if(!transportFailed.get()){
+                asyncSendPacket(info.createRemoveCommand());
+            }
+            isConnectionInfoSentToBroker=false;
         }        
         if( userSpecifiedClientID ) {
             info.setClientId(null);