diff --git a/PluralKit.Bot/Commands/Groups.cs b/PluralKit.Bot/Commands/Groups.cs
index 0a671e2f..b9eb60b6 100644
--- a/PluralKit.Bot/Commands/Groups.cs
+++ b/PluralKit.Bot/Commands/Groups.cs
@@ -103,7 +103,7 @@ namespace PluralKit.Bot
 
             // No perms check, display name isn't covered by member privacy
 
-            if (!ctx.HasNext())
+            if (!ctx.HasNext(false))
             {
                 if (target.DisplayName == null)
                     await ctx.Reply(noDisplayNameSetMessage);
@@ -160,7 +160,7 @@ namespace PluralKit.Bot
             if (ctx.System?.Id == target.System)
                 noDescriptionSetMessage += $" To set one, type `pk;group {target.Reference()} description <description>`.";
 
-            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 20bce62c..33cc773d 100644
--- a/PluralKit.Bot/Commands/MemberEdit.cs
+++ b/PluralKit.Bot/Commands/MemberEdit.cs
@@ -66,7 +66,7 @@ namespace PluralKit.Bot
             if (!target.DescriptionPrivacy.CanAccess(ctx.LookupContextFor(target.System)))
                 throw Errors.LookupNotAllowed;
 
-            if (!ctx.HasNext())
+            if (!ctx.HasNext(false))
             {
                 if (target.Description == null)
                     await ctx.Reply(noDescriptionSetMessage);
@@ -118,7 +118,7 @@ namespace PluralKit.Bot
             if (!target.PronounPrivacy.CanAccess(ctx.LookupContextFor(target.System)))
                 throw Errors.LookupNotAllowed;
 
-            if (!ctx.HasNext())
+            if (!ctx.HasNext(false))
             {
                 if (target.Pronouns == null)
                     await ctx.Reply(noPronounsSetMessage);
@@ -354,7 +354,7 @@ namespace PluralKit.Bot
 
             // No perms check, display name isn't covered by member privacy
 
-            if (!ctx.HasNext())
+            if (!ctx.HasNext(false))
             {
                 var eb = await CreateMemberNameInfoEmbed(ctx, target);
                 if (ctx.System?.Id == target.System)
@@ -403,7 +403,7 @@ namespace PluralKit.Bot
 
             // No perms check, display name isn't covered by member privacy
 
-            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 fe576408..2a9e1316 100644
--- a/PluralKit.Bot/Commands/SystemEdit.cs
+++ b/PluralKit.Bot/Commands/SystemEdit.cs
@@ -33,7 +33,7 @@ namespace PluralKit.Bot
 
             ctx.CheckSystem();
 
-            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.");
@@ -77,7 +77,7 @@ namespace PluralKit.Bot
 
             ctx.CheckSystem();
 
-            if (!ctx.HasNext())
+            if (!ctx.HasNext(false))
             {
                 if (ctx.System.Description == null)
                     await ctx.Reply(noDescriptionSetMessage);