diff --git a/src/timeman.cpp b/src/timeman.cpp
index 8bda4f25abc..62b7eb11432 100644
--- a/src/timeman.cpp
+++ b/src/timeman.cpp
@@ -110,12 +110,7 @@ void TimeManager::init(const Search::LimitsType& limits, int currentPly, Color u
 
   // Initialize to maximum values but unstablePVExtraTime that is reset
   unstablePVExtraTime = 0;
-  optimumSearchTime = maximumSearchTime = limits.time[us]; // In msec
-
-  // Scale down emergencyBaseTime if we are under very high time pressure to
-  // avoid moving immediately and so blundering.
-  if (maximumSearchTime)
-      emergencyBaseTime /= std::max(emergencyBaseTime * 100 / maximumSearchTime, 1);
+  optimumSearchTime = maximumSearchTime = limits.time[us];
 
   // We calculate optimum time usage for different hypothetic "moves to go"-values and choose the
   // minimum of calculated search time values. Usually the greatest hypMTG gives the minimum values.
diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index 909618090cb..7e6e6dc48fd 100644
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -80,8 +80,8 @@ void init(OptionsMap& o) {
   o["MultiPV"]                     = Option(1, 1, 500);
   o["Skill Level"]                 = Option(20, 0, 20);
   o["Emergency Move Horizon"]      = Option(40, 0, 50);
-  o["Emergency Base Time"]         = Option(200, 0, 30000);
-  o["Emergency Move Time"]         = Option(70, 0, 5000);
+  o["Emergency Base Time"]         = Option(50, 0, 30000);
+  o["Emergency Move Time"]         = Option( 5, 0, 5000);
   o["Minimum Thinking Time"]       = Option(20, 0, 5000);
   o["Slow Mover"]                  = Option(50, 10, 1000);
   o["UCI_Chess960"]                = Option(false);