diff --git a/data/formats-data.js b/data/formats-data.js
index 8dcccd61ad..e05c36fd02 100644
--- a/data/formats-data.js
+++ b/data/formats-data.js
@@ -7509,7 +7509,7 @@ let BattleFormatsData = {
 		tier: "LC",
 	},
 	barraskewda: {
-		randomBattleMoves: ["aquajet", "closecombat", "crunch", "liquidation", "poisonjab", "raindance"],
+		randomBattleMoves: ["aquajet", "closecombat", "crunch", "liquidation", "poisonjab"],
 		tier: "New",
 		doublesTier: "New",
 	},
diff --git a/data/random-teams.js b/data/random-teams.js
index fd78f31ea4..cfada21ab0 100644
--- a/data/random-teams.js
+++ b/data/random-teams.js
@@ -1611,7 +1611,7 @@ class RandomTeams {
 						tierCount[tier] = 1;
 					} else {
 						tierCount[tier]++;
-						if (this.gen === 8 && (!isMonotype || tierCount[tier] > 2)) continue;
+						if (this.gen < 8 && (!isMonotype || tierCount[tier] > 2)) continue;
 					}
 
 					if (!isMonotype) {