diff --git a/src/Mewdeko/Modules/Administration/Services/LogCommandService.cs b/src/Mewdeko/Modules/Administration/Services/LogCommandService.cs
index 5b20e2e72..321150f88 100644
--- a/src/Mewdeko/Modules/Administration/Services/LogCommandService.cs
+++ b/src/Mewdeko/Modules/Administration/Services/LogCommandService.cs
@@ -1058,6 +1058,15 @@ private async Task OnMessageDeleted(Cacheable<IMessage, ulong> args, Cacheable<I
 
             var entry = auditLogs.FirstOrDefault();
 
+            if (entry.Data is not MessageDeleteAuditLogData data)
+                return;
+
+            var currentTime = DateTimeOffset.UtcNow;
+            var timeThreshold = TimeSpan.FromSeconds(2);
+
+            var deleteUser = data.ChannelId == message.Channel.Id &&
+                             (currentTime - entry.CreatedAt) <= timeThreshold ? entry.User : message.Author;
+
             var eb = new EmbedBuilder()
                 .WithOkColor()
                 .WithTitle("Message Deleted")
@@ -1065,7 +1074,7 @@ private async Task OnMessageDeleted(Cacheable<IMessage, ulong> args, Cacheable<I
                     $"`Message Author:` {message.Author.Mention}\n" +
                     $"`Message Channel:` {guildChannel.Mention} | {guildChannel.Id}\n" +
                     $"`Message Content:` {message.Content}\n" +
-                    $"`Deleted By:` {(entry is null ? message.Author.Mention : entry.User.Mention)} | {(entry is null ? message.Author.Id : entry.User.Id)}");
+                    $"`Deleted By:` {deleteUser.Mention} | {deleteUser.Id}");
 
             // Handle attachments
             if (message.Attachments.Count != 0)