diff --git a/MQTTnet.Core/Server/MqttClientMessageQueue.cs b/MQTTnet.Core/Server/MqttClientMessageQueue.cs
index d5f20b0a..ae7cb7a7 100644
--- a/MQTTnet.Core/Server/MqttClientMessageQueue.cs
+++ b/MQTTnet.Core/Server/MqttClientMessageQueue.cs
@@ -56,7 +56,7 @@ namespace MQTTnet.Core.Server
             {
                 if (_pendingPublishPackets.Count == 0)
                 {
-                    await Task.Delay(TimeSpan.FromMilliseconds(5));
+                    await Task.Delay(TimeSpan.FromMilliseconds(5)).ConfigureAwait(false);
                     continue;
                 }