diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/system/BotCore.java b/application/src/main/java/org/togetherjava/tjbot/commands/system/BotCore.java
index f4b1d6d1ba..8cc95de6f1 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/system/BotCore.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/system/BotCore.java
@@ -2,6 +2,7 @@
 
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.Channel;
+import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.MessageContextInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.UserContextInteractionEvent;
@@ -241,6 +242,17 @@ public void onSlashCommandInteraction(SlashCommandInteractionEvent event) {
                     .onSlashCommand(event));
     }
 
+    @Override
+    public void onCommandAutoCompleteInteraction(final CommandAutoCompleteInteractionEvent event) {
+        String name = event.getName();
+
+        logger.debug("Received auto completion from command '{}' (#{}) on guild '{}'",
+                event.getCommandPath(), event.getId(), event.getGuild());
+        COMMAND_SERVICE.execute(() -> requireUserInteractor(
+                UserInteractorPrefix.SLASH_COMMAND.getPrefixedName(name), SlashCommand.class)
+                    .onAutoComplete(event));
+    }
+
     @Override
     public void onButtonInteraction(ButtonInteractionEvent event) {
         logger.debug("Received button click '{}' (#{}) on guild '{}'", event.getComponentId(),