diff --git a/src/main/java/cc/fascinated/bat/service/CommandService.java b/src/main/java/cc/fascinated/bat/service/CommandService.java
index c54ba1d..d01240f 100644
--- a/src/main/java/cc/fascinated/bat/service/CommandService.java
+++ b/src/main/java/cc/fascinated/bat/service/CommandService.java
@@ -150,6 +150,7 @@ public class CommandService extends ListenerAdapter {
         try {
             BatCommandExecutor executor = null;
             List<Permission> requiredPermissions = new ArrayList<>();
+            boolean isSubCommand = false;
 
             // No args provided, use the main command executor
             if (event.getInteraction().getSubcommandName() == null) {
@@ -162,6 +163,7 @@ public class CommandService extends ListenerAdapter {
                         executor = subCommand.getValue();
                         requiredPermissions.addAll(Arrays.asList(subCommand.getValue().getCommandInfo().requiredPermissions()));
                         requiredPermissions.addAll(Arrays.asList(command.getCommandInfo().requiredPermissions())); // not sure if we'd want this, but it's here for now
+                        isSubCommand = true;
                         break;
                     }
                 }
@@ -196,6 +198,14 @@ public class CommandService extends ListenerAdapter {
                     return;
                 }
             }
+
+            if (isSubCommand && command.getCommandInfo().guildOnly() && !ranInsideGuild) {
+                event.replyEmbeds(EmbedUtils.errorEmbed()
+                        .setDescription("This command can only be executed in a guild")
+                        .build()).setEphemeral(true).queue();
+                return;
+            }
+
             log.info("Executing command \"{}\" for user \"{}\"", commandName, user.getDiscordUser().getName());
             executor.execute(guild, user, ranInsideGuild ? event.getChannel().asTextChannel() : event.getChannel().asPrivateChannel(),
                     event.getMember(), event.getInteraction());