diff --git a/src/components/puzzles/PuzzleBoard.tsx b/src/components/puzzles/PuzzleBoard.tsx
index b8cb1e8b..380f87a3 100644
--- a/src/components/puzzles/PuzzleBoard.tsx
+++ b/src/components/puzzles/PuzzleBoard.tsx
@@ -89,7 +89,7 @@ function PuzzleBoard({
     const uci = makeUci(move);
     newPos.play(move);
 
-    if (puzzle.moves[currentMove] === uci) {
+    if (puzzle.moves[currentMove] === uci || newPos.isCheckmate()) {
       if (currentMove === puzzle.moves.length - 1) {
         if (puzzle.completion !== "incorrect") {
           changeCompletion("correct");