diff --git a/src/Discord.Net.WebSocket/DiscordSocketClient.cs b/src/Discord.Net.WebSocket/DiscordSocketClient.cs
index 7d0e34cd9..41a0c5167 100644
--- a/src/Discord.Net.WebSocket/DiscordSocketClient.cs
+++ b/src/Discord.Net.WebSocket/DiscordSocketClient.cs
@@ -1296,7 +1296,7 @@ namespace Discord.WebSocket
                                         bool isCached = cachedMsg != null;
                                         var user = await channel.GetUserAsync(data.UserId, CacheMode.CacheOnly).ConfigureAwait(false);
 
-                                        var optionalMsg = cachedMsg is null
+                                        var optionalMsg = !isCached
                                             ? Optional.Create<SocketUserMessage>()
                                             : Optional.Create(cachedMsg);
 
@@ -1329,7 +1329,7 @@ namespace Discord.WebSocket
                                         bool isCached = cachedMsg != null;
                                         var user = await channel.GetUserAsync(data.UserId, CacheMode.CacheOnly).ConfigureAwait(false);
 
-                                        var optionalMsg = cachedMsg is null
+                                        var optionalMsg = !isCached
                                             ? Optional.Create<SocketUserMessage>()
                                             : Optional.Create(cachedMsg);