diff --git a/src/main/java/org/bukkit/command/defaults/DefaultGameModeCommand.java b/src/main/java/org/bukkit/command/defaults/DefaultGameModeCommand.java
index 1611d413..9557b097 100644
--- a/src/main/java/org/bukkit/command/defaults/DefaultGameModeCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/DefaultGameModeCommand.java
@@ -68,9 +68,8 @@ public class DefaultGameModeCommand extends VanillaCommand {
 
         if (args.length == 1) {
             return StringUtil.copyPartialMatches(args[0], GAMEMODE_NAMES, new ArrayList<String>(GAMEMODE_NAMES.size()));
-        } else if (args.length == 2) {
-            return super.tabComplete(sender, alias, args);
         }
+
         return ImmutableList.of();
     }
 }