diff --git a/polyglot.ini b/polyglot.ini
index 739ed8765d4..b851a33abc8 100644
--- a/polyglot.ini
+++ b/polyglot.ini
@@ -44,4 +44,3 @@ Emergency Move Time = 70
 Minimum Thinking Time = 20
 Slow Mover = 100
 UCI_Chess960 = false
-UCI_AnalyseMode = false
diff --git a/src/search.cpp b/src/search.cpp
index 668fd095568..eb3fc82a408 100644
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -185,6 +185,11 @@ void Search::think() {
   RootColor = RootPos.side_to_move();
   TimeMgr.init(Limits, RootPos.game_ply(), RootColor);
 
+  // Dynamic draw value: try to avoid repetition draws at early midgame
+  int cf = std::max(70 - RootPos.game_ply(), 0);
+  DrawValue[ RootColor] = VALUE_DRAW - Value(cf);
+  DrawValue[~RootColor] = VALUE_DRAW + Value(cf);
+
   if (RootMoves.empty())
   {
       RootMoves.push_back(MOVE_NONE);
@@ -206,16 +211,6 @@ void Search::think() {
       }
   }
 
-  if (!Options["UCI_AnalyseMode"])
-  {
-      // Dynamic draw value: try to avoid repetition draws at early midgame
-      int cf = std::max(70 - RootPos.game_ply(), 0);
-      DrawValue[ RootColor] = VALUE_DRAW - Value(cf);
-      DrawValue[~RootColor] = VALUE_DRAW + Value(cf);
-  }
-  else
-      DrawValue[WHITE] = DrawValue[BLACK] = VALUE_DRAW;
-
   if (Options["Write Search Log"])
   {
       Log log(Options["Search Log Filename"]);
diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index c96c1d7ba51..68a57bd5778 100644
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -85,7 +85,6 @@ void init(OptionsMap& o) {
   o["Minimum Thinking Time"]       = Option(20, 0, 5000);
   o["Slow Mover"]                  = Option(80, 10, 1000);
   o["UCI_Chess960"]                = Option(false);
-  o["UCI_AnalyseMode"]             = Option(false, on_eval);
 }