diff --git a/src/search.c b/src/search.c
index 2f734b2d..2f5f219b 100644
--- a/src/search.c
+++ b/src/search.c
@@ -138,10 +138,10 @@ static int Quiescence(Thread *thread, Stack *ss, int alpha, const int beta) {
     while ((move = NextMove(&mp))) {
 
         // Avoid pruning until at least one move avoids a terminal loss score
-        if (bestScore <= -TBWIN_IN_MAX || !pos->nonPawnCount[sideToMove]) goto search;
+        if (bestScore <= -TBWIN_IN_MAX) goto search;
 
         // Only try moves the movepicker deems good
-        if (mp.stage > NOISY_GOOD) break;
+        if (mp.stage > NOISY_GOOD && pos->nonPawnCount[sideToMove]) break;
 
         // Futility pruning
         if (    futility + PieceValue[EG][capturing(move)] <= alpha