diff --git a/Build/MQTTnet.nuspec b/Build/MQTTnet.nuspec
index a3d62f15..d3fdeb50 100644
--- a/Build/MQTTnet.nuspec
+++ b/Build/MQTTnet.nuspec
@@ -34,6 +34,7 @@
 * [Server] Added support for a custom exception handler in _MqttServerMultiThreadedApplicationMessageInterceptorDelegate_.
 * [Server] Removed logger from _MqttServerMultiThreadedApplicationMessageInterceptorDelegate_ (BREAKING CHANGE!).
 * [Server] Fixed a memory leak when deleting sessions.
+* [Server] Fixed timestamp check in server keep-alive monitor (thanks to @logicaloud, #1277).
 * [Server] Added support for returning individual subscription errors (#80 thanks to @jimch)
 * [Server] Improved topic filter comparisons (support for $).
 * [Server] Fixed wrong "IsSessionPresent" result (thanks to @logicaloud, #1268).
diff --git a/Source/MQTTnet/Implementations/MqttTcpServerAdapter.Uwp.cs b/Source/MQTTnet/Implementations/MqttTcpServerAdapter.Uwp.cs
index dd164ba9..bda77739 100644
--- a/Source/MQTTnet/Implementations/MqttTcpServerAdapter.Uwp.cs
+++ b/Source/MQTTnet/Implementations/MqttTcpServerAdapter.Uwp.cs
@@ -1,7 +1,7 @@
 #if WINDOWS_UWP
 using Windows.Networking.Sockets;
 using MQTTnet.Adapter;
-using MQTTnet.Diagnostics;
+using MQTTnet.Diagnostics.Logger;
 using MQTTnet.Formatter;
 using MQTTnet.Server;
 using System;
@@ -13,7 +13,7 @@ namespace MQTTnet.Implementations
 {
     public sealed class MqttTcpServerAdapter : IMqttServerAdapter
     {
-        readonly IMqttNetScopedLogger _logger;
+        readonly MqttNetSourceLogger _logger;
         readonly IMqttNetLogger _rootLogger;
 
         IMqttServerOptions _options;
@@ -22,7 +22,7 @@ namespace MQTTnet.Implementations
         public MqttTcpServerAdapter(IMqttNetLogger logger)
         {
             _rootLogger = logger ?? throw new ArgumentNullException(nameof(logger));
-            _logger = logger.CreateScopedLogger(nameof(MqttTcpServerAdapter));
+            _logger = logger.WithSource(nameof(MqttTcpServerAdapter));
         }
 
         public Func<IMqttChannelAdapter, Task> ClientHandler { get; set; }