diff --git a/Source/MQTTnet/Client/MqttClient.cs b/Source/MQTTnet/Client/MqttClient.cs
index 93112598..7bc21de4 100644
--- a/Source/MQTTnet/Client/MqttClient.cs
+++ b/Source/MQTTnet/Client/MqttClient.cs
@@ -222,7 +222,7 @@ namespace MQTTnet.Client
 
             try
             {
-                if (!(exception is MqttCommunicationClosedGracefullyException))
+                if (clientWasConnected)
                 {
                     await WaitForTaskAsync(_packetReceiverTask, sender).ConfigureAwait(false);
                     await WaitForTaskAsync(_keepAliveMessageSenderTask, sender).ConfigureAwait(false);