diff --git a/src/de/steamwar/bungeecore/commands/FightCommand.java b/src/de/steamwar/bungeecore/commands/FightCommand.java
index bc203f24..88cfc6bf 100644
--- a/src/de/steamwar/bungeecore/commands/FightCommand.java
+++ b/src/de/steamwar/bungeecore/commands/FightCommand.java
@@ -119,12 +119,16 @@ public class FightCommand extends BasicCommand {
         if(mode == null)
             return;
 
-        if(args.length < startArg+2){
+        String map;
+        if(mode.getMaps().size() == 1){
+            map = mode.getRandomMap();
+        }else if(args.length < startArg+2){
             getMaps(sender, precommand, mode);
             return;
+        }else{
+            map = getMap(sender, mode, args[startArg+1]);
         }
 
-        String map = getMap(sender, mode, args[startArg+1]);
         if(map == null)
             return;