diff --git a/src/main/java/net/dv8tion/jda/api/interactions/commands/build/CommandData.java b/src/main/java/net/dv8tion/jda/api/interactions/commands/build/CommandData.java
index 5cd8abfd0d..0b03d3ee6f 100644
--- a/src/main/java/net/dv8tion/jda/api/interactions/commands/build/CommandData.java
+++ b/src/main/java/net/dv8tion/jda/api/interactions/commands/build/CommandData.java
@@ -140,6 +140,8 @@ public CommandData setDefaultEnabled(boolean enabled)
     public CommandData addOptions(@Nonnull OptionData... options)
     {
         Checks.noneNull(options, "Option");
+        if (options.length == 0)
+            return this;
         Checks.check(options.length + this.options.length() <= 25, "Cannot have more than 25 options for a command!");
         Checks.check(allowOption, "You cannot mix options with subcommands/groups.");
         allowSubcommands = allowGroups = false;
@@ -257,8 +259,11 @@ public CommandData addOption(@Nonnull OptionType type, @Nonnull String name, @No
     public CommandData addSubcommands(@Nonnull SubcommandData... subcommands)
     {
         Checks.noneNull(subcommands, "Subcommands");
+        if (subcommands.length == 0)
+            return this;
         if (!allowSubcommands)
             throw new IllegalArgumentException("You cannot mix options with subcommands/groups.");
+        
         allowOption = false;
         Checks.check(subcommands.length + options.length() <= 25, "Cannot have more than 25 subcommands for a command!");
         for (SubcommandData data : subcommands)
@@ -301,6 +306,8 @@ public CommandData addSubcommands(@Nonnull Collection<? extends SubcommandData>
     public CommandData addSubcommandGroups(@Nonnull SubcommandGroupData... groups)
     {
         Checks.noneNull(groups, "SubcommandGroups");
+        if (groups.length == 0)
+            return this;
         if (!allowGroups)
             throw new IllegalArgumentException("You cannot mix options with subcommands/groups.");
         allowOption = false;