diff --git a/src/main/java/net/buildtheearth/buildteamtools/modules/navigation/components/warps/commands/BtWarpsCommand.java b/src/main/java/net/buildtheearth/buildteamtools/modules/navigation/components/warps/commands/BtWarpsCommand.java
index fc960d46..497d0620 100644
--- a/src/main/java/net/buildtheearth/buildteamtools/modules/navigation/components/warps/commands/BtWarpsCommand.java
+++ b/src/main/java/net/buildtheearth/buildteamtools/modules/navigation/components/warps/commands/BtWarpsCommand.java
@@ -6,9 +6,14 @@
 import net.buildtheearth.buildteamtools.modules.navigation.components.warps.WarpsComponent;
 import net.buildtheearth.buildteamtools.modules.network.model.BuildTeam;
 import net.buildtheearth.buildteamtools.modules.network.model.Permissions;
+import net.buildtheearth.buildteamtools.modules.common.commands.BttCommandManager;
+import net.buildtheearth.buildteamtools.modules.network.NetworkModule;
 import org.bukkit.entity.Player;
 import org.incendo.cloud.parser.standard.StringParser;
 
+import java.util.List;
+import java.util.stream.Stream;
+
 public class BtWarpsCommand extends BuildteamCommand {
     @Override
     public void register(Module owner) {
@@ -20,6 +25,17 @@ public void register(Module owner) {
                 (sender, buildTeamName) -> btCommand(sender, buildTeamName, Permissions.WARP_USE));
     }
 
+    @Override
+    protected List<String> suggestions(String input) {
+        BuildTeam current = NetworkModule.getInstance().getBuildTeam();
+        List<String> candidates = NetworkModule.getInstance().getBuildTeams().stream()
+                .filter(team -> team.getWarpGroups() != null && !team.getWarpGroups().isEmpty())
+                .filter(team -> current == null || !team.getID().equals(current.getID()))
+                .flatMap(team -> Stream.of(team.getTag(), team.getBlankName()))
+                .toList();
+        return BttCommandManager.matchingSuggestions(candidates, input);
+    }
+
     @Override
     public void execute(Player player, BuildTeam team) {
         WarpsComponent.openWarpMenu(player, team, null);