diff --git a/src/de/steamwar/bungeecore/commands/TypeMappers.java b/src/de/steamwar/bungeecore/commands/TypeMappers.java
index 3539a0d..faedfba 100644
--- a/src/de/steamwar/bungeecore/commands/TypeMappers.java
+++ b/src/de/steamwar/bungeecore/commands/TypeMappers.java
@@ -66,6 +66,12 @@ public class TypeMappers {
                 return ArenaMode.getByChat(s);
             }
 
+            @Override
+            public boolean validate(CommandSender sender, ArenaMode value, MessageSender messageSender) {
+                if (value == null) return true;
+                return value.isHistoric() == historic;
+            }
+
             @Override
             public Collection<String> tabCompletes(CommandSender sender, String[] previousArguments, String s) {
                 return ArenaMode.getAllChatNames(historic);