diff --git a/src/lib/client.ts b/src/lib/client.ts
index 25320da2a..6f1e8bc9f 100644
--- a/src/lib/client.ts
+++ b/src/lib/client.ts
@@ -2260,9 +2260,9 @@ export default class MqttClient extends TypedEventEmitter<MqttClientEventCallbac
 						break
 					}
 				}
+				this.removeListener('close', remove)
 				if (allProcessed) {
 					clearStoreProcessing()
-					this.removeListener('close', remove)
 					this._invokeAllStoreProcessingQueue()
 					this.emit('connect', packet)
 				} else {