diff --git a/src/movepick.cpp b/src/movepick.cpp
index 0649518938a..2a1fb837348 100644
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -216,7 +216,7 @@ Move MovePicker::select(Pred filter) {
 // This is the most important method of the MovePicker class. We emit one
 // new pseudo-legal move on every call until there are no more moves left,
 // picking the move with the highest score from a list of generated moves.
-Move MovePicker::next_move(bool skipQuiets) {
+Move MovePicker::next_move() {
 
     auto quiet_threshold = [](Depth d) { return -3560 * d; };
 
@@ -322,4 +322,6 @@ Move MovePicker::next_move(bool skipQuiets) {
     return Move::none();  // Silence warning
 }
 
+void MovePicker::skip_quiet_moves() { skipQuiets = true; }
+
 }  // namespace Stockfish
diff --git a/src/movepick.h b/src/movepick.h
index dff09f79c3e..f8f84d02474 100644
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -212,7 +212,8 @@ class MovePicker {
                const PawnHistory*,
                int);
     MovePicker(const Position&, Move, int, const CapturePieceToHistory*);
-    Move next_move(bool skipQuiets = false);
+    Move next_move();
+    void skip_quiet_moves();
 
    private:
     template<PickType T, typename Pred>
@@ -234,6 +235,7 @@ class MovePicker {
     int                          threshold;
     Depth                        depth;
     int                          ply;
+    bool                         skipQuiets = false;
     ExtMove                      moves[MAX_MOVES];
 };
 
diff --git a/src/search.cpp b/src/search.cpp
index c7a8c28b474..4864057c1b1 100644
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -942,12 +942,11 @@ Value Search::Worker::search(
 
     value = bestValue;
 
-    int  moveCount        = 0;
-    bool moveCountPruning = false;
+    int moveCount = 0;
 
     // Step 13. Loop through all pseudo-legal moves until no moves remain
     // or a beta cutoff occurs.
-    while ((move = mp.next_move(moveCountPruning)) != Move::none())
+    while ((move = mp.next_move()) != Move::none())
     {
         assert(move.is_ok());
 
@@ -993,7 +992,8 @@ Value Search::Worker::search(
         if (!rootNode && pos.non_pawn_material(us) && bestValue > VALUE_TB_LOSS_IN_MAX_PLY)
         {
             // Skip quiet moves if movecount exceeds our FutilityMoveCount threshold (~8 Elo)
-            moveCountPruning = moveCount >= futility_move_count(improving, depth);
+            if (moveCount >= futility_move_count(improving, depth))
+                mp.skip_quiet_moves();
 
             // Reduced depth of the next LMR search
             int lmrDepth = newDepth - r;