diff --git a/Data/Scripts/018_Alternate battle modes/002_Battle Frontier rules/002_Challenge_Rulesets.rb b/Data/Scripts/018_Alternate battle modes/002_Battle Frontier rules/002_Challenge_Rulesets.rb
index 2c038d47e..8681c46f6 100644
--- a/Data/Scripts/018_Alternate battle modes/002_Battle Frontier rules/002_Challenge_Rulesets.rb	
+++ b/Data/Scripts/018_Alternate battle modes/002_Battle Frontier rules/002_Challenge_Rulesets.rb	
@@ -148,7 +148,7 @@ class PokemonRuleSet
   def canRegisterTeam?(team)
     return false if !team || team.length < self.minTeamLength
     return false if team.length > self.maxTeamLength
-    teamNumber = [self.maxLength, team.length].min
+    teamNumber = self.minTeamLength
     team.each do |pkmn|
       return false if !isPokemonValid?(pkmn)
     end
@@ -175,7 +175,7 @@ class PokemonRuleSet
   # team rules and subset rules. Not all Pokemon in the team have to be valid.
   def hasValidTeam?(team)
     return false if !team || team.length < self.minTeamLength
-    teamNumber = [self.maxLength, team.length].min
+    teamNumber = self.minTeamLength
     validPokemon = []
     team.each do |pkmn|
       validPokemon.push(pkmn) if isPokemonValid?(pkmn)