diff --git a/Build/MQTTnet.nuspec b/Build/MQTTnet.nuspec
index f5137d18..e67689ce 100644
--- a/Build/MQTTnet.nuspec
+++ b/Build/MQTTnet.nuspec
@@ -27,6 +27,7 @@
 * [Server] Replaced all events with proper async compatible handlers (BREAKING CHANGE!).
 * [Server] The used logger instance is now propagated to the WebSocket server adapter.
 * [Server] Added the flag "IsSecureConnection" which is set to true when the connection is encrypted.
+* [Server] Fixed wrong will message behavior when stopping server (thanks to @JohBa)
 * [MQTTnet Server] Added as first Alpha version.
 
 * [Note] Due to MQTTv5 a lot of new classes were introduced. This required adding new namespaces as well. Most classes are backward compatible but new namespaces must be added.
diff --git a/Source/MQTTnet/Server/MqttServer.cs b/Source/MQTTnet/Server/MqttServer.cs
index c3b970c4..918cfb60 100644
--- a/Source/MQTTnet/Server/MqttServer.cs
+++ b/Source/MQTTnet/Server/MqttServer.cs
@@ -145,10 +145,10 @@ namespace MQTTnet.Server
                 {
                     return;
                 }
-
-                _cancellationTokenSource.Cancel(false);
                 
-                await _clientSessionsManager.StopAsync().ConfigureAwait(false);
+                _clientSessionsManager.Stop();
+                
+                _cancellationTokenSource.Cancel(false);
 
                 foreach (var adapter in _adapters)
                 {
diff --git a/appveyor.yml b/appveyor.yml
index 24ea5f4b..4d7b08a0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -15,4 +15,4 @@ build:
 
 test_script:
 - cmd: dotnet vstest "%APPVEYOR_BUILD_FOLDER%\Tests\MQTTnet.Core.Tests\bin\Release\netcoreapp2.1\MQTTnet.Core.Tests.dll"
-- cmd: dotnet vstest "%APPVEYOR_BUILD_FOLDER%\Tests\MQTTnet.TestApp.AspNetCore\bin\Release\netcoreapp2.1\MQTTnet.TestApp.AspNetCore.dll"
+- cmd: dotnet vstest "%APPVEYOR_BUILD_FOLDER%\Tests\MQTTnet.AspNetCore.Tests\bin\Release\netcoreapp2.1\MQTTnet.AspNetCore.Tests.dll"