diff --git a/data/mods/gen1/random-teams.js b/data/mods/gen1/random-teams.js
index 660e5af825481..283cb53fcec61 100644
--- a/data/mods/gen1/random-teams.js
+++ b/data/mods/gen1/random-teams.js
@@ -134,7 +134,7 @@ class RandomGen1Teams extends RandomGen2Teams {
 		let pokemonPool = [];
 		for (let id in this.data.FormatsData) {
 			let template = this.getTemplate(id);
-			if (template.gen <= this.gen && template.randomBattleMoves) {
+			if (!template.isNonstandard && template.gen <= this.gen && template.randomBattleMoves) {
 				pokemonPool.push(id);
 			}
 		}
diff --git a/data/mods/gen2/random-teams.js b/data/mods/gen2/random-teams.js
index b9fd700a248ad..7c86f5f56de88 100644
--- a/data/mods/gen2/random-teams.js
+++ b/data/mods/gen2/random-teams.js
@@ -11,7 +11,7 @@ class RandomGen2Teams extends RandomGen3Teams {
 		let pokemonPool = [];
 		for (let id in this.data.FormatsData) {
 			let template = this.getTemplate(id);
-			if (template.gen <= this.gen && this.data.FormatsData[id].randomSet1) {
+			if (!template.isNonstandard && template.gen <= this.gen && this.data.FormatsData[id].randomSet1) {
 				pokemonPool.push(id);
 			}
 		}