diff --git a/Source/MQTTnet/Client/MqttClient.cs b/Source/MQTTnet/Client/MqttClient.cs
index 4891b1f0..0fa074c2 100644
--- a/Source/MQTTnet/Client/MqttClient.cs
+++ b/Source/MQTTnet/Client/MqttClient.cs
@@ -229,11 +229,8 @@ namespace MQTTnet.Client
 
             try
             {
-                if (clientWasConnected)
-                {
-                    await WaitForTaskAsync(_packetReceiverTask, sender).ConfigureAwait(false);
-                    await WaitForTaskAsync(_keepAliveMessageSenderTask, sender).ConfigureAwait(false);
-                }
+                await WaitForTaskAsync(_packetReceiverTask, sender).ConfigureAwait(false);
+                await WaitForTaskAsync(_keepAliveMessageSenderTask, sender).ConfigureAwait(false);
 
                 if (_adapter != null)
                 {