diff --git a/src/search.cpp b/src/search.cpp
index 9c3f915d..91b3c789 100644
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -528,6 +528,9 @@ Value Search::Worker::search(
     if (depth <= 0)
         return qsearch < PvNode ? PV : NonPV > (pos, ss, alpha, beta);
 
+    // Limit the depth if extensions made it too large
+    depth = std::min(depth, MAX_PLY - 1);
+
     // Check if we have an upcoming move that draws by repetition, or
     // if the opponent had an alternative move earlier to this position.
     if (!rootNode && alpha < VALUE_DRAW && pos.has_game_cycle(ss->ply))
diff --git a/tests/instrumented.sh b/tests/instrumented.sh
index e77ee0dd..cb5a3a9f 100755
--- a/tests/instrumented.sh
+++ b/tests/instrumented.sh
@@ -170,6 +170,11 @@ cat << EOF > game.exp
  expect "score mate -1"
  expect "bestmove"
 
+ send "ucinewgame\n"
+ send "position fen 7K/P1p1p1p1/2P1P1Pk/6pP/3p2P1/1P6/3P4/8 w - - 0 1\n"
+ send "go nodes 500000\n"
+ expect "bestmove"
+
  send "ucinewgame\n"
  send "position fen 8/5R2/2K1P3/4k3/8/b1PPpp1B/5p2/8 w - -\n"
  send "go depth 18\n"