diff --git a/src/Responders/GuildLoadedResponder.cs b/src/Responders/GuildLoadedResponder.cs
index cd40134..b03fd3f 100644
--- a/src/Responders/GuildLoadedResponder.cs
+++ b/src/Responders/GuildLoadedResponder.cs
@@ -74,12 +74,8 @@ public class GuildLoadedResponder : IResponder<IGuildCreate>
         _logger.LogInformation("Loaded guild \"{Name}\" ({ID}) owned by {Owner} ({OwnerID}) with {MemberCount} members",
             guild.Name, guild.ID, owner.GetTag(), owner.ID, guild.MemberCount);
 
-        if (!GuildSettings.ReceiveStartupMessages.Get(cfg))
-        {
-            return Result.Success;
-        }
-
-        if (GuildSettings.PrivateFeedbackChannel.Get(cfg).Empty())
+        if (GuildSettings.PrivateFeedbackChannel.Get(cfg).Empty()
+            || !GuildSettings.ReceiveStartupMessages.Get(cfg))
         {
             return Result.Success;
         }
diff --git a/src/Responders/MessageEditedResponder.cs b/src/Responders/MessageEditedResponder.cs
index 2f30732..1143652 100644
--- a/src/Responders/MessageEditedResponder.cs
+++ b/src/Responders/MessageEditedResponder.cs
@@ -46,28 +46,16 @@ public class MessageEditedResponder : IResponder<IMessageUpdate>
             return new ArgumentNullError(nameof(gatewayEvent.ChannelID));
         }
 
-        if (!gatewayEvent.GuildID.IsDefined(out var guildId))
-        {
-            return Result.Success;
-        }
-
-        if (gatewayEvent.Author.IsDefined(out var author) && author.IsBot.OrDefault(false))
-        {
-            return Result.Success;
-        }
-
-        if (!gatewayEvent.EditedTimestamp.IsDefined(out var timestamp))
-        {
-            return Result.Success; // The message wasn't actually edited
-        }
-
-        if (!gatewayEvent.Content.IsDefined(out var newContent))
+        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))
         {
             return Result.Success;
         }
 
         var cfg = await _guildData.GetSettings(guildId, ct);
-        if (GuildSettings.PrivateFeedbackChannel.Get(cfg).Empty())
+        if (author.IsBot.OrDefault(false) || GuildSettings.PrivateFeedbackChannel.Get(cfg).Empty())
         {
             return Result.Success;
         }