diff --git a/src/main/java/de/slimecloud/slimeball/features/message/MessageCommand.java b/src/main/java/de/slimecloud/slimeball/features/message/MessageCommand.java
index 0462bc72..36e2a9b5 100644
--- a/src/main/java/de/slimecloud/slimeball/features/message/MessageCommand.java
+++ b/src/main/java/de/slimecloud/slimeball/features/message/MessageCommand.java
@@ -37,7 +37,11 @@ public static class SendCommand {
 		@Autocomplete("message")
 		public void autocomplete(@NotNull SlimeBot bot, @NotNull CommandAutoCompleteInteractionEvent event) {
 			event.replyChoices(bot.loadGuildResource(event.getGuild(), "messages", false, File::list)
-					.map(list -> Arrays.stream(list).map(e -> new Command.Choice(e, e)).toList())
+					.map(list -> Arrays.stream(list)
+							.filter(e -> e.startsWith(event.getFocusedOption().getValue()))
+							.map(e -> new Command.Choice(e, e))
+							.toList()
+					)
 					.orElse(Collections.emptyList())
 			).queue();
 		}