diff --git a/play.pokemonshowdown.com/src/battle-dex-search.ts b/play.pokemonshowdown.com/src/battle-dex-search.ts
index a17bed67c..340051176 100644
--- a/play.pokemonshowdown.com/src/battle-dex-search.ts
+++ b/play.pokemonshowdown.com/src/battle-dex-search.ts
@@ -1661,8 +1661,8 @@ class BattleMoveSearch extends BattleTypedSearch<'move'> {
 		}
 		const moveData = dex.moves.get(id);
 		if (!moveData) return true;
+		if (!BattleMovedex[id].exists) return true; //Flag ALL custom moves as viable by default (unviable custom moves almost never happen, no need to add extra steps to create multi-hit moves)
 		if (moveData.category === 'Status') {
-			if (!BattleMovedex[id].exists) return true; //Flag custom moves as viable by default
 			return BattleMoveSearch.GOOD_STATUS_MOVES.includes(id);
 		}
 		if (moveData.flags?.charge) {