diff --git a/src/Discord.Net.WebSocket/DiscordSocketClient.cs b/src/Discord.Net.WebSocket/DiscordSocketClient.cs
index 15a848d56..2c8518b5e 100644
--- a/src/Discord.Net.WebSocket/DiscordSocketClient.cs
+++ b/src/Discord.Net.WebSocket/DiscordSocketClient.cs
@@ -2991,7 +2991,7 @@ namespace Discord.WebSocket
                                         data.TriggerType,
                                         cacheableUser,
                                         cacheableChannel,
-                                        cacheableMessage,
+                                        cachedMsg is not null ? cacheableMessage : null,
                                         data.AlertSystemMessageId.GetValueOrDefault(0),
                                         data.Content,
                                         data.MatchedContent.IsSpecified
diff --git a/src/Discord.Net.WebSocket/Entities/Guilds/AutoModActionExecutedData.cs b/src/Discord.Net.WebSocket/Entities/Guilds/AutoModActionExecutedData.cs
index d6b3204f9..0643c1500 100644
--- a/src/Discord.Net.WebSocket/Entities/Guilds/AutoModActionExecutedData.cs
+++ b/src/Discord.Net.WebSocket/Entities/Guilds/AutoModActionExecutedData.cs
@@ -30,7 +30,7 @@ public class AutoModActionExecutedData
     /// <remarks>
     ///     This property will be <see langword="null"/> if the message was blocked by the automod.
     /// </remarks>
-    public Cacheable<IUserMessage, ulong> Message { get; }
+    public Cacheable<IUserMessage, ulong>? Message { get; }
 
     /// <summary>
     ///     Gets the id of the system auto moderation messages posted as a result of this action.
@@ -66,7 +66,7 @@ public class AutoModActionExecutedData
         AutoModTriggerType triggerType,
         Cacheable<SocketGuildUser, ulong> user,
         Cacheable<ISocketMessageChannel, ulong> channel,
-        Cacheable<IUserMessage, ulong> message,
+        Cacheable<IUserMessage, ulong>? message,
         ulong alertMessageId,
         string content,
         string matchedContent,