diff --git a/www/js/interface.js b/www/js/interface.js
index a0c9fe4..2ab4e69 100644
--- a/www/js/interface.js
+++ b/www/js/interface.js
@@ -1106,9 +1106,8 @@ const INTERFACE = {
             let piece = null;
             let target = null;
             while(INTERFACE_DATA.replay_turn < turn) {
-                if(INTERFACE_DATA.history[INTERFACE_DATA.replay_turn].source < 2) {
-                    play = INTERFACE_DATA.history[INTERFACE_DATA.replay_turn];
-                    
+                play = INTERFACE_DATA.history[INTERFACE_DATA.replay_turn];
+                if(play.source < 2) {
                     if(play.source == 0) {
                         let piece_id = GAME_DATA.board.tiles[play.from].piece;
                         if(piece_id !== null) { piece = GAME_DATA.board.pieces[piece_id].clone(); }
@@ -1126,12 +1125,12 @@ const INTERFACE = {
                         target = null;
                     }
                 } else {
-                    play = null;
                     GAME_DATA.process(play);
+                    play = null;
                 }
                 INTERFACE_DATA.replay_turn++;
             }
-            if(animate) {
+            if(animate && play !== null) {
                 INTERFACE_DATA.Animate.time = Date.now() + 500;
                 INTERFACE_DATA.Animate.play = play;
                 INTERFACE_DATA.Animate.piece = piece;