diff --git a/src/main/java/org/mvplugins/multiverse/core/command/MVCommandCompletions.java b/src/main/java/org/mvplugins/multiverse/core/command/MVCommandCompletions.java
index 044d3e692..6a0493785 100644
--- a/src/main/java/org/mvplugins/multiverse/core/command/MVCommandCompletions.java
+++ b/src/main/java/org/mvplugins/multiverse/core/command/MVCommandCompletions.java
@@ -279,19 +279,16 @@ private Collection<String> suggestMVWorlds(BukkitCommandCompletionContext contex
             case "both" -> {
                 return worldManager.getWorlds().stream()
                         .map(MultiverseWorld::getTabCompleteName)
-                        .map(StringFormatter::quoteMultiWordString)
                         .toList();
             }
             case "loaded" -> {
                 return worldManager.getLoadedWorlds().stream()
                         .map(MultiverseWorld::getTabCompleteName)
-                        .map(StringFormatter::quoteMultiWordString)
                         .toList();
             }
             case "unloaded" -> {
                 return worldManager.getUnloadedWorlds().stream()
                         .map(MultiverseWorld::getTabCompleteName)
-                        .map(StringFormatter::quoteMultiWordString)
                         .toList();
             }
             case "potential" -> {
diff --git a/src/main/java/org/mvplugins/multiverse/core/command/MVRootCommand.java b/src/main/java/org/mvplugins/multiverse/core/command/MVRootCommand.java
index 7460ea7b7..1ff268516 100644
--- a/src/main/java/org/mvplugins/multiverse/core/command/MVRootCommand.java
+++ b/src/main/java/org/mvplugins/multiverse/core/command/MVRootCommand.java
@@ -22,6 +22,9 @@ public BaseCommand execute(CommandIssuer sender, String commandLabel, String[] a
     @Override
     public List<String> getTabCompletions(CommandIssuer sender, String alias, String[] args, boolean commandsOnly, boolean isAsync) {
         String[] quoteFormatedArgs = StringFormatter.parseQuotesInArgs(args).toArray(String[]::new);
-        return super.getTabCompletions(sender, alias, quoteFormatedArgs, commandsOnly, isAsync);
+        return super.getTabCompletions(sender, alias, quoteFormatedArgs, commandsOnly, isAsync)
+                .stream()
+                .map(StringFormatter::quoteMultiWordString)
+                .toList();
     }
 }