diff --git a/data/mods/ssb/moves.ts b/data/mods/ssb/moves.ts
index 39974f8016..855cb70b02 100644
--- a/data/mods/ssb/moves.ts
+++ b/data/mods/ssb/moves.ts
@@ -1769,7 +1769,9 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 			this.boost(oppBoost, target);
 			target.trySetStatus('tox', source);
 			if (source.species.baseSpecies === 'Alcremie') {
-				const newSet = ['Finland', 'Finland-Tsikhe', 'Finland-Nezavisa', 'Finland-Järvilaulu'][this.random(4)];
+				const formes = ['Finland', 'Finland-Tsikhe', 'Finland-Nezavisa', 'Finland-Järvilaulu']
+					.filter(forme => ssbSets[forme].species !== source.species.name);
+				const newSet = this.sample(formes);
 				changeSet(this, source, ssbSets[newSet]);
 			}
 		},
@@ -5106,7 +5108,8 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 			this.attrLastMove('[still]');
 		},
 		onPrepareHit(foe, source, move) {
-			const formes = ['Cleric', 'Ninja', 'Dancer', 'Songstress', 'Jester'];
+			const formes = ['Cleric', 'Ninja', 'Dancer', 'Songstress', 'Jester']
+				.filter(forme => ssbSets[`yuki-${forme}`].species !== source.species.name);
 			source.m.yukiCosplayForme = this.sample(formes);
 			switch (source.m.yukiCosplayForme) {
 			case 'Cleric':