diff --git a/Source/MQTTnet/Server/MqttClientSessionsManager.cs b/Source/MQTTnet/Server/MqttClientSessionsManager.cs
index cf58ec7c..e0ce7e4e 100644
--- a/Source/MQTTnet/Server/MqttClientSessionsManager.cs
+++ b/Source/MQTTnet/Server/MqttClientSessionsManager.cs
@@ -170,6 +170,11 @@ namespace MQTTnet.Server
         {
             try
             {
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    return;
+                }
+
                 var enqueuedApplicationMessage = _messageQueue.Take(cancellationToken);
 
                 var sender = enqueuedApplicationMessage.Sender;
diff --git a/Tests/MQTTnet.Core.Tests/MqttFactoryTests.cs b/Tests/MQTTnet.Core.Tests/MqttFactoryTests.cs
index 42f735fa..3bdaa05d 100644
--- a/Tests/MQTTnet.Core.Tests/MqttFactoryTests.cs
+++ b/Tests/MQTTnet.Core.Tests/MqttFactoryTests.cs
@@ -2,8 +2,6 @@
 using MQTTnet.Diagnostics;
 using MQTTnet.Extensions.ManagedClient;
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;