diff --git a/src/PuzzleSingleImageState.cpp b/src/PuzzleSingleImageState.cpp
index e90f511..66d1227 100644
--- a/src/PuzzleSingleImageState.cpp
+++ b/src/PuzzleSingleImageState.cpp
@@ -105,6 +105,9 @@ void PuzzleSingleImageState::Update() {
 					std::swap(shuffeled_pieces[i], shuffeled_pieces[marked_piece]);
 					marked_piece = -1;
 				}
+				else if (i == marked_piece) {
+					marked_piece = -1;
+				}
 				else {
 					marked_piece = i;
 				}