diff --git a/src/data/move.ts b/src/data/move.ts
index 9964409df7a..2eb2f792ef9 100644
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -6748,7 +6748,8 @@ export class SketchAttr extends MoveEffectAttr {
       return false;
     }
 
-    const targetMove = target.getMoveHistory().filter(m => !m.virtual).at(-1);
+    const targetMove = target.getLastXMoves(target.battleSummonData.turnCount)
+      .find(m => m.move !== Moves.NONE && m.move !== Moves.STRUGGLE && !m.virtual);
     if (!targetMove) {
       return false;
     }
diff --git a/src/test/moves/sketch.test.ts b/src/test/moves/sketch.test.ts
index 2e3eb97a76c..4386ce5868e 100644
--- a/src/test/moves/sketch.test.ts
+++ b/src/test/moves/sketch.test.ts
@@ -1,10 +1,12 @@
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import { MoveResult } from "#app/field/pokemon";
+import { MoveResult, PokemonMove } from "#app/field/pokemon";
 import GameManager from "#test/utils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+import { StatusEffect } from "#app/enums/status-effect";
+import { BattlerIndex } from "#app/battle";
 
 describe("Moves - Sketch", () => {
   let phaserGame: Phaser.Game;
@@ -32,22 +34,46 @@ describe("Moves - Sketch", () => {
   });
 
   it("Sketch should not fail even if a previous Sketch failed to retrieve a valid move and ran out of PP", async () => {
-    game.override.moveset([ Moves.SKETCH, Moves.SKETCH ]);
-
     await game.classicMode.startBattle([ Species.REGIELEKI ]);
-    const playerPokemon = game.scene.getPlayerPokemon();
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    // can't use normal moveset override because we need to check moveset changes
+    playerPokemon.moveset = [ new PokemonMove(Moves.SKETCH), new PokemonMove(Moves.SKETCH) ];
 
     game.move.select(Moves.SKETCH);
     await game.phaseInterceptor.to("TurnEndPhase");
-    expect(playerPokemon?.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
-    const moveSlot0 = playerPokemon?.getMoveset()[0];
-    expect(moveSlot0?.moveId).toBe(Moves.SKETCH);
-    expect(moveSlot0?.getPpRatio()).toBe(0);
+    expect(playerPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+    const moveSlot0 = playerPokemon.getMoveset()[0]!;
+    expect(moveSlot0.moveId).toBe(Moves.SKETCH);
+    expect(moveSlot0.getPpRatio()).toBe(0);
 
     await game.toNextTurn();
     game.move.select(Moves.SKETCH);
     await game.phaseInterceptor.to("TurnEndPhase");
-    expect(playerPokemon?.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
-    // Can't verify if the player Pokemon's moveset was successfully changed because of overrides.
+    expect(playerPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
+    expect(playerPokemon.moveset[0]?.moveId).toBe(Moves.SPLASH);
+    expect(playerPokemon.moveset[1]?.moveId).toBe(Moves.SKETCH);
+  });
+
+  it("Sketch should retrieve the most recent valid move from its target history", async () => {
+    game.override.enemyStatusEffect(StatusEffect.PARALYSIS);
+    await game.classicMode.startBattle([ Species.REGIELEKI ]);
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    playerPokemon.moveset = [ new PokemonMove(Moves.SKETCH), new PokemonMove(Moves.GROWL) ];
+
+    game.move.select(Moves.GROWL);
+    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.move.forceStatusActivation(false);
+    await game.phaseInterceptor.to("TurnEndPhase");
+    expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
+
+    await game.toNextTurn();
+    game.move.select(Moves.SKETCH);
+    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.move.forceStatusActivation(true);
+    await game.phaseInterceptor.to("TurnEndPhase");
+    expect(playerPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
+    expect(playerPokemon.moveset[0]?.moveId).toBe(Moves.SPLASH);
+    expect(playerPokemon.moveset[1]?.moveId).toBe(Moves.GROWL);
   });
 });