diff --git a/TeamOctolings.Octobot/Responders/MessageEditedResponder.cs b/TeamOctolings.Octobot/Responders/MessageEditedResponder.cs
index 2968562..e3d1c58 100644
--- a/TeamOctolings.Octobot/Responders/MessageEditedResponder.cs
+++ b/TeamOctolings.Octobot/Responders/MessageEditedResponder.cs
@@ -36,40 +36,29 @@ public sealed class MessageEditedResponder : IResponder<IMessageUpdate>
 
     public async Task<Result> RespondAsync(IMessageUpdate gatewayEvent, CancellationToken ct = default)
     {
-        if (!gatewayEvent.ID.IsDefined(out var messageId))
-        {
-            return new ArgumentNullError(nameof(gatewayEvent.ID));
-        }
-
-        if (!gatewayEvent.ChannelID.IsDefined(out var channelId))
-        {
-            return new ArgumentNullError(nameof(gatewayEvent.ChannelID));
-        }
-
         if (!gatewayEvent.GuildID.IsDefined(out var guildId)
-            || !gatewayEvent.Author.IsDefined(out var author)
-            || !gatewayEvent.EditedTimestamp.IsDefined(out var timestamp)
-            || !gatewayEvent.Content.IsDefined(out var newContent))
+            || !gatewayEvent.EditedTimestamp.HasValue
+            || gatewayEvent.Author.IsBot.OrDefault(false))
         {
             return Result.Success;
         }
 
         var cfg = await _guildData.GetSettings(guildId, ct);
-        if (author.IsBot.OrDefault(false) || GuildSettings.PrivateFeedbackChannel.Get(cfg).Empty())
+        if (GuildSettings.PrivateFeedbackChannel.Get(cfg).Empty())
         {
             return Result.Success;
         }
 
-        var cacheKey = new KeyHelpers.MessageCacheKey(channelId, messageId);
+        var cacheKey = new KeyHelpers.MessageCacheKey(gatewayEvent.ChannelID, gatewayEvent.ID);
         var messageResult = await _cacheService.TryGetValueAsync<IMessage>(
             cacheKey, ct);
         if (!messageResult.IsDefined(out var message))
         {
-            _ = _channelApi.GetChannelMessageAsync(channelId, messageId, ct);
+            _ = _channelApi.GetChannelMessageAsync(gatewayEvent.ChannelID, gatewayEvent.ID, ct);
             return Result.Success;
         }
 
-        if (message.Content == newContent)
+        if (message.Content == gatewayEvent.Content)
         {
             return Result.Success;
         }
@@ -83,22 +72,22 @@ public sealed class MessageEditedResponder : IResponder<IMessageUpdate>
         // We don't need to await this since the result is not needed
         // NOTE: Because this is not awaited, there may be a race condition depending on how fast clients are able to edit their messages
         // NOTE: Awaiting this might not even solve this if the same responder is called asynchronously
-        _ = _channelApi.GetChannelMessageAsync(channelId, messageId, ct);
+        _ = _channelApi.GetChannelMessageAsync(gatewayEvent.ChannelID, gatewayEvent.ID, ct);
 
-        var diff = InlineDiffBuilder.Diff(message.Content, newContent);
+        var diff = InlineDiffBuilder.Diff(message.Content, gatewayEvent.Content);
 
         Messages.Culture = GuildSettings.Language.Get(cfg);
 
         var builder = new StringBuilder()
             .AppendLine(diff.AsMarkdown())
             .AppendLine(string.Format(Messages.DescriptionActionJumpToMessage,
-                $"https://discord.com/channels/{guildId}/{channelId}/{messageId}")
+                $"https://discord.com/channels/{guildId}/{gatewayEvent.ChannelID}/{gatewayEvent.ID}")
             );
 
         var embed = new EmbedBuilder()
             .WithSmallTitle(string.Format(Messages.CachedMessageEdited, message.Author.GetTag()), message.Author)
             .WithDescription(builder.ToString())
-            .WithTimestamp(timestamp.Value)
+            .WithTimestamp(gatewayEvent.EditedTimestamp.Value)
             .WithColour(ColorsList.Yellow)
             .Build();
 
diff --git a/TeamOctolings.Octobot/TeamOctolings.Octobot.csproj b/TeamOctolings.Octobot/TeamOctolings.Octobot.csproj
index 418803a..b67eaf8 100644
--- a/TeamOctolings.Octobot/TeamOctolings.Octobot.csproj
+++ b/TeamOctolings.Octobot/TeamOctolings.Octobot.csproj
@@ -27,11 +27,11 @@
         <PackageReference Include="JetBrains.Annotations" Version="2024.3.0"/>
         <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.4" />
         <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0"/>
-        <PackageReference Include="Remora.Commands" Version="10.0.6"/>
-        <PackageReference Include="Remora.Discord.Caching" Version="39.0.0" />
-        <PackageReference Include="Remora.Discord.Extensions" Version="5.3.6"/>
-        <PackageReference Include="Remora.Discord.Hosting" Version="6.0.10" />
-        <PackageReference Include="Remora.Discord.Interactivity" Version="5.0.0"/>
+        <PackageReference Include="Remora.Commands" Version="11.0.1"/>
+        <PackageReference Include="Remora.Discord.Caching" Version="40.0.0" />
+        <PackageReference Include="Remora.Discord.Extensions" Version="6.0.0"/>
+        <PackageReference Include="Remora.Discord.Hosting" Version="7.0.0" />
+        <PackageReference Include="Remora.Discord.Interactivity" Version="6.0.0"/>
         <PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
     </ItemGroup>
     <ItemGroup>