diff --git a/Source/MQTTnet/Server/MqttClientConnection.cs b/Source/MQTTnet/Server/MqttClientConnection.cs
index c346e285..b12d4139 100644
--- a/Source/MQTTnet/Server/MqttClientConnection.cs
+++ b/Source/MQTTnet/Server/MqttClientConnection.cs
@@ -105,7 +105,7 @@ namespace MQTTnet.Server
 
             StopInternal();
 
-            await _packageReceiverTask;
+            await (_packageReceiverTask ?? PlatformAbstractionLayer.CompletedTask);
         }
 
         public void ResetStatistics()