diff --git a/play.pokemonshowdown.com/src/battle.ts b/play.pokemonshowdown.com/src/battle.ts
index 4a9b73e9af..763c5c34b2 100644
--- a/play.pokemonshowdown.com/src/battle.ts
+++ b/play.pokemonshowdown.com/src/battle.ts
@@ -2229,6 +2229,20 @@ export class Battle {
 			let item = Dex.items.get(args[2]);
 			let effect = Dex.getEffect(kwArgs.from);
 			let ofpoke = this.getPokemon(kwArgs.of);
+			if (!poke) {
+				if (effect.id === 'frisk') {
+					const possibleTargets = ofpoke!.side.foe.active.filter(p => p !== null);
+					if (possibleTargets.length === 1) {
+						poke = possibleTargets[0]!;
+					} else {
+						this.activateAbility(ofpoke!, "Frisk");
+						this.log(args, kwArgs);
+						break;
+					}
+				} else {
+					throw new Error('No Pokemon in -item message');
+				}
+			}
 			poke.item = item.name;
 			poke.itemEffect = '';
 			poke.removeVolatile('airballoon' as ID);