diff --git a/position.h b/position.h
index 932b795..3f6e036 100644
--- a/position.h
+++ b/position.h
@@ -182,6 +182,13 @@ template <typename PieceC = EnginePiece, typename = std::enable_if_t<is_piece_en
 
     inline void doNullMove() {
         history.push_back(current_state);
+        current_state.incr_sqs[0] = current_state.incr_sqs[1] = current_state.incr_sqs[2] = current_state.incr_sqs[3] = SQ_NONE;
+        current_state.incr_pc[0] = current_state.incr_pc[1] = current_state.incr_pc[2] = current_state.incr_pc[3] =
+            PieceC::NO_PIECE;
+        if (current_state.epIncluded)
+            current_state.hash ^= zobrist::RandomEP[file_of(ep_square())];
+        current_state.epIncluded = false;
+        current_state.enPassant = SQ_NONE;
         current_state.turn = ~current_state.turn;
         current_state.hash ^= zobrist::RandomTurn;
         current_state.fullMoveNumber += (current_state.turn == WHITE);
diff --git a/tests.cpp b/tests.cpp
index 3c60bf0..ee557da 100644
--- a/tests.cpp
+++ b/tests.cpp
@@ -402,6 +402,29 @@ TEST_CASE("Experienced bugs in this repo") {
         REQUIRE(p.zobrist() == p.hash());
         REQUIRE(p.hash() == 4177524090105507023);
     }
+    {
+        Position p;
+        p.doMove<false>(Move(SQ_A2, SQ_A3));
+        REQUIRE(p.zobrist() == p.hash());
+        p.doMove<false>(Move(SQ_B8, SQ_A6));
+        REQUIRE(p.zobrist() == p.hash());
+        p.doMove<false>(Move(SQ_F2, SQ_F3));
+        REQUIRE(p.zobrist() == p.hash());
+        p.doMove<false>(Move(SQ_F7, SQ_F5));
+        REQUIRE(p.zobrist() == p.hash());
+        p.doNullMove();
+        REQUIRE(p.zobrist() == p.hash());
+        p.undoMove();
+        REQUIRE(p.zobrist() == p.hash());
+        p.undoMove();
+        REQUIRE(p.zobrist() == p.hash());
+        p.undoMove();
+        REQUIRE(p.zobrist() == p.hash());
+        p.undoMove();
+        REQUIRE(p.zobrist() == p.hash());
+        p.undoMove();
+        REQUIRE(p.zobrist() == p.hash());
+    }
     {
         Position p;
         REQUIRE(p.getCastlingPath(WHITE, true) == 0x60);