diff --git a/PluralKit.Bot/Commands/Groups.cs b/PluralKit.Bot/Commands/Groups.cs
index 4639c766..d4df511c 100644
--- a/PluralKit.Bot/Commands/Groups.cs
+++ b/PluralKit.Bot/Commands/Groups.cs
@@ -111,7 +111,7 @@ namespace PluralKit.Bot
                     await ctx.Reply($"```\n{target.DisplayName}\n```");
                 return;
             }
-            if (!ctx.HasNext())
+            if (!ctx.HasNext(false))
             {
                 if (target.DisplayName == null)
                     await ctx.Reply(noDisplayNameSetMessage);
@@ -168,7 +168,7 @@ namespace PluralKit.Bot
                     await ctx.Reply($"```\n{target.Description}\n```");
                 return;
             }
-            if (!ctx.HasNext())
+            if (!ctx.HasNext(false))
             {
                 if (target.Description == null)
                     await ctx.Reply(noDescriptionSetMessage);
diff --git a/PluralKit.Bot/Commands/MemberEdit.cs b/PluralKit.Bot/Commands/MemberEdit.cs
index 5c90423c..edbd54f8 100644
--- a/PluralKit.Bot/Commands/MemberEdit.cs
+++ b/PluralKit.Bot/Commands/MemberEdit.cs
@@ -75,7 +75,7 @@ namespace PluralKit.Bot
                     await ctx.Reply($"```\n{target.Description}\n```");
                 return;
             }
-            if (!ctx.HasNext())
+            if (!ctx.HasNext(false))
             {
                 if (target.Description == null)
                     await ctx.Reply(noDescriptionSetMessage);
@@ -127,7 +127,7 @@ namespace PluralKit.Bot
                     await ctx.Reply($"```\n{target.Pronouns}\n```");
                 return;
             }
-            if (!ctx.HasNext())
+            if (!ctx.HasNext(false))
             {
                 if (target.Pronouns == null)
                     await ctx.Reply(noPronounsSetMessage);
@@ -363,7 +363,7 @@ namespace PluralKit.Bot
                     await ctx.Reply($"```\n{target.DisplayName}\n```");
                 return;
             }
-            if (!ctx.HasNext())
+            if (!ctx.HasNext(false))
             {
                 var eb = await CreateMemberNameInfoEmbed(ctx, target);
                 if (ctx.System?.Id == target.System)
@@ -414,7 +414,7 @@ namespace PluralKit.Bot
                     await ctx.Reply($"```\n{memberGuildConfig.DisplayName}\n```");
                 return;
             }
-            if (!ctx.HasNext())
+            if (!ctx.HasNext(false))
             {
                 var eb = await CreateMemberNameInfoEmbed(ctx, target);
                 if (ctx.System?.Id == target.System)
diff --git a/PluralKit.Bot/Commands/SystemEdit.cs b/PluralKit.Bot/Commands/SystemEdit.cs
index fda4e6d9..f06cef89 100644
--- a/PluralKit.Bot/Commands/SystemEdit.cs
+++ b/PluralKit.Bot/Commands/SystemEdit.cs
@@ -41,7 +41,7 @@ namespace PluralKit.Bot
                     await ctx.Reply(noNameSetMessage);
                 return;
             }
-            if (!ctx.HasNext())
+            if (!ctx.HasNext(false))
             {
                 if (ctx.System.Name != null)
                     await ctx.Reply($"Your system's name is currently **{ctx.System.Name}**. Type `pk;system name -clear` to clear it.");
@@ -85,7 +85,7 @@ namespace PluralKit.Bot
                     await ctx.Reply($"```\n{ctx.System.Description}\n```");
                 return;
             }
-            if (!ctx.HasNext())
+            if (!ctx.HasNext(false))
             {
                 if (ctx.System.Description == null)
                     await ctx.Reply(noDescriptionSetMessage);
@@ -175,7 +175,7 @@ namespace PluralKit.Bot
                     await ctx.Reply($"```\n{ctx.System.Tag}\n```");
                 return;
             }
-            if (!ctx.HasNext())
+            if (!ctx.HasNext(false))
             {
                 if (ctx.System.Tag == null)
                     await ctx.Reply(noTagSetMessage);