diff --git a/org.eclipse.paho.client.mqttv3/src/main/java-templates/org/eclipse/paho/client/mqttv3/internal/ClientComms.java b/org.eclipse.paho.client.mqttv3/src/main/java-templates/org/eclipse/paho/client/mqttv3/internal/ClientComms.java
index b0c433498..c219569e5 100644
--- a/org.eclipse.paho.client.mqttv3/src/main/java-templates/org/eclipse/paho/client/mqttv3/internal/ClientComms.java
+++ b/org.eclipse.paho.client.mqttv3/src/main/java-templates/org/eclipse/paho/client/mqttv3/internal/ClientComms.java
@@ -351,7 +351,7 @@ public void shutdownConnection(MqttToken token, MqttException reason) {
 		// This method could concurrently be invoked from many places only allow it
 		// to run once.
 		synchronized(conLock) {
-			if (stoppingComms || closePending || isClosed()) {
+			if (stoppingComms || isClosed()) {
 				return;
 			}
 			stoppingComms = true;
diff --git a/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/ClientComms.java b/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/ClientComms.java
index 7a8463242..5cfba91e7 100644
--- a/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/ClientComms.java
+++ b/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/ClientComms.java
@@ -391,7 +391,7 @@ public void shutdownConnection(MqttToken token, MqttException reason, MqttDiscon
 		// This method could concurrently be invoked from many places only allow it
 		// to run once.
 		synchronized (conLock) {
-			if (stoppingComms || closePending || isClosed()) {
+			if (stoppingComms || isClosed()) {
 				return;
 			}
 			stoppingComms = true;