diff --git a/lib/src/model/analysis/analysis_controller.dart b/lib/src/model/analysis/analysis_controller.dart
index 6e6bdb08be..008f3c249f 100644
--- a/lib/src/model/analysis/analysis_controller.dart
+++ b/lib/src/model/analysis/analysis_controller.dart
@@ -191,20 +191,11 @@ class AnalysisController extends _$AnalysisController implements PgnTreeNotifier
     );
 
     if (analysisState.isEngineAvailable) {
-      evaluationService
-          .initEngine(
-            _evaluationContext,
-            options: EvaluationOptions(
-              multiPv: prefs.numEvalLines,
-              cores: prefs.numEngineCores,
-              searchTime: prefs.engineSearchTime,
-            ),
-          )
-          .then((_) {
-            _startEngineEvalTimer = Timer(const Duration(milliseconds: 250), () {
-              _startEngineEval();
-            });
-          });
+      evaluationService.initEngine(_evaluationContext, options: _evaluationOptions).then((_) {
+        _startEngineEvalTimer = Timer(const Duration(milliseconds: 250), () {
+          _startEngineEval();
+        });
+      });
     }
 
     return analysisState;
@@ -213,6 +204,9 @@ class AnalysisController extends _$AnalysisController implements PgnTreeNotifier
   EvaluationContext get _evaluationContext =>
       EvaluationContext(variant: _variant, initialPosition: _root.position);
 
+  EvaluationOptions get _evaluationOptions =>
+      ref.read(analysisPreferencesProvider).evaluationOptions;
+
   void onUserMove(NormalMove move, {bool shouldReplace = false}) {
     if (!state.requireValue.position.isLegal(move)) return;
 
@@ -360,17 +354,9 @@ class AnalysisController extends _$AnalysisController implements PgnTreeNotifier
     );
 
     if (state.requireValue.isEngineAvailable) {
-      final prefs = ref.read(analysisPreferencesProvider);
       await ref
           .read(evaluationServiceProvider)
-          .initEngine(
-            _evaluationContext,
-            options: EvaluationOptions(
-              multiPv: prefs.numEvalLines,
-              cores: prefs.numEngineCores,
-              searchTime: prefs.engineSearchTime,
-            ),
-          );
+          .initEngine(_evaluationContext, options: _evaluationOptions);
       _startEngineEval();
     } else {
       _stopEngineEval();
@@ -381,15 +367,7 @@ class AnalysisController extends _$AnalysisController implements PgnTreeNotifier
   void setNumEvalLines(int numEvalLines) {
     ref.read(analysisPreferencesProvider.notifier).setNumEvalLines(numEvalLines);
 
-    ref
-        .read(evaluationServiceProvider)
-        .setOptions(
-          EvaluationOptions(
-            multiPv: numEvalLines,
-            cores: ref.read(analysisPreferencesProvider).numEngineCores,
-            searchTime: ref.read(analysisPreferencesProvider).engineSearchTime,
-          ),
-        );
+    ref.read(evaluationServiceProvider).setOptions(_evaluationOptions);
 
     _root.updateAll((node) => node.eval = null);
 
@@ -406,15 +384,7 @@ class AnalysisController extends _$AnalysisController implements PgnTreeNotifier
   void setEngineCores(int numEngineCores) {
     ref.read(analysisPreferencesProvider.notifier).setEngineCores(numEngineCores);
 
-    ref
-        .read(evaluationServiceProvider)
-        .setOptions(
-          EvaluationOptions(
-            multiPv: ref.read(analysisPreferencesProvider).numEvalLines,
-            cores: numEngineCores,
-            searchTime: ref.read(analysisPreferencesProvider).engineSearchTime,
-          ),
-        );
+    ref.read(evaluationServiceProvider).setOptions(_evaluationOptions);
 
     _startEngineEval();
   }
@@ -422,15 +392,7 @@ class AnalysisController extends _$AnalysisController implements PgnTreeNotifier
   void setEngineSearchTime(Duration searchTime) {
     ref.read(analysisPreferencesProvider.notifier).setEngineSearchTime(searchTime);
 
-    ref
-        .read(evaluationServiceProvider)
-        .setOptions(
-          EvaluationOptions(
-            multiPv: ref.read(analysisPreferencesProvider).numEvalLines,
-            cores: ref.read(analysisPreferencesProvider).numEngineCores,
-            searchTime: searchTime,
-          ),
-        );
+    ref.read(evaluationServiceProvider).setOptions(_evaluationOptions);
 
     _startEngineEval();
   }
@@ -553,6 +515,14 @@ class AnalysisController extends _$AnalysisController implements PgnTreeNotifier
     }
   }
 
+  void _refreshCurrentNode() {
+    state = AsyncData(
+      state.requireValue.copyWith(
+        currentNode: AnalysisCurrentNode.fromNode(_root.nodeAt(state.requireValue.currentPath)),
+      ),
+    );
+  }
+
   Future<(UciPath, FullOpening)?> _fetchOpening(Node fromNode, UciPath path) async {
     if (!kOpeningAllowedVariants.contains(_variant)) return null;
 
@@ -572,15 +542,16 @@ class AnalysisController extends _$AnalysisController implements PgnTreeNotifier
 
     final curState = state.requireValue;
     if (curState.currentPath == path) {
-      state = AsyncData(
-        curState.copyWith(currentNode: AnalysisCurrentNode.fromNode(_root.nodeAt(path))),
-      );
+      _refreshCurrentNode();
     }
   }
 
-  void _startEngineEval() {
+  Future<void> _startEngineEval() async {
     final curState = state.requireValue;
     if (!curState.isEngineAvailable) return;
+    await ref
+        .read(evaluationServiceProvider)
+        .ensureEngineInitialized(_evaluationContext, options: _evaluationOptions);
     ref
         .read(evaluationServiceProvider)
         .start(
@@ -589,7 +560,13 @@ class AnalysisController extends _$AnalysisController implements PgnTreeNotifier
           initialPositionEval: _root.eval,
           shouldEmit: (work) => work.path == state.valueOrNull?.currentPath,
         )
-        ?.forEach((t) => _root.updateAt(t.$1.path, (node) => node.eval = t.$2));
+        ?.forEach((t) {
+          final (work, eval) = t;
+          _root.updateAt(work.path, (node) => node.eval = eval);
+          if (work.path == curState.currentPath && eval.searchTime >= work.searchTime) {
+            _refreshCurrentNode();
+          }
+        });
   }
 
   void _debouncedStartEngineEval() {
@@ -601,12 +578,7 @@ class AnalysisController extends _$AnalysisController implements PgnTreeNotifier
   void _stopEngineEval() {
     ref.read(evaluationServiceProvider).stop();
     // update the current node with last cached eval
-    final curState = state.requireValue;
-    state = AsyncData(
-      curState.copyWith(
-        currentNode: AnalysisCurrentNode.fromNode(_root.nodeAt(curState.currentPath)),
-      ),
-    );
+    _refreshCurrentNode();
   }
 
   void _listenToServerAnalysisEvents() {
diff --git a/lib/src/model/analysis/analysis_preferences.dart b/lib/src/model/analysis/analysis_preferences.dart
index 0916da00a0..5b16d74da4 100644
--- a/lib/src/model/analysis/analysis_preferences.dart
+++ b/lib/src/model/analysis/analysis_preferences.dart
@@ -99,6 +99,9 @@ class AnalysisPrefs with _$AnalysisPrefs implements Serializable {
   factory AnalysisPrefs.fromJson(Map<String, dynamic> json) {
     return _$AnalysisPrefsFromJson(json);
   }
+
+  EvaluationOptions get evaluationOptions =>
+      EvaluationOptions(multiPv: numEvalLines, cores: numEngineCores, searchTime: engineSearchTime);
 }
 
 Duration _searchTimeDefault() {
diff --git a/lib/src/model/broadcast/broadcast_game_controller.dart b/lib/src/model/broadcast/broadcast_game_controller.dart
index ee14654f14..1a13c90547 100644
--- a/lib/src/model/broadcast/broadcast_game_controller.dart
+++ b/lib/src/model/broadcast/broadcast_game_controller.dart
@@ -120,20 +120,11 @@ class BroadcastGameController extends _$BroadcastGameController implements PgnTr
     );
 
     if (broadcastState.isLocalEvaluationEnabled) {
-      evaluationService
-          .initEngine(
-            _evaluationContext,
-            options: EvaluationOptions(
-              multiPv: prefs.numEvalLines,
-              cores: prefs.numEngineCores,
-              searchTime: ref.read(analysisPreferencesProvider).engineSearchTime,
-            ),
-          )
-          .then((_) {
-            _startEngineEvalTimer = Timer(const Duration(milliseconds: 250), () {
-              _startEngineEval();
-            });
-          });
+      evaluationService.initEngine(_evaluationContext, options: _evaluationOptions).then((_) {
+        _startEngineEvalTimer = Timer(const Duration(milliseconds: 250), () {
+          _startEngineEval();
+        });
+      });
     }
 
     return broadcastState;
@@ -251,6 +242,9 @@ class BroadcastGameController extends _$BroadcastGameController implements PgnTr
   EvaluationContext get _evaluationContext =>
       EvaluationContext(variant: Variant.standard, initialPosition: _root.position);
 
+  EvaluationOptions get _evaluationOptions =>
+      ref.read(analysisPreferencesProvider).evaluationOptions;
+
   void onUserMove(NormalMove move) {
     if (!state.hasValue) return;
 
@@ -388,17 +382,9 @@ class BroadcastGameController extends _$BroadcastGameController implements PgnTr
     );
 
     if (state.requireValue.isLocalEvaluationEnabled) {
-      final prefs = ref.read(analysisPreferencesProvider);
       await ref
           .read(evaluationServiceProvider)
-          .initEngine(
-            _evaluationContext,
-            options: EvaluationOptions(
-              multiPv: prefs.numEvalLines,
-              cores: prefs.numEngineCores,
-              searchTime: ref.read(analysisPreferencesProvider).engineSearchTime,
-            ),
-          );
+          .initEngine(_evaluationContext, options: _evaluationOptions);
       _startEngineEval();
     } else {
       _stopEngineEval();
@@ -411,15 +397,7 @@ class BroadcastGameController extends _$BroadcastGameController implements PgnTr
 
     ref.read(analysisPreferencesProvider.notifier).setNumEvalLines(numEvalLines);
 
-    ref
-        .read(evaluationServiceProvider)
-        .setOptions(
-          EvaluationOptions(
-            multiPv: numEvalLines,
-            cores: ref.read(analysisPreferencesProvider).numEngineCores,
-            searchTime: ref.read(analysisPreferencesProvider).engineSearchTime,
-          ),
-        );
+    ref.read(evaluationServiceProvider).setOptions(_evaluationOptions);
 
     _root.updateAll((node) => node.eval = null);
 
@@ -435,15 +413,7 @@ class BroadcastGameController extends _$BroadcastGameController implements PgnTr
   void setEngineCores(int numEngineCores) {
     ref.read(analysisPreferencesProvider.notifier).setEngineCores(numEngineCores);
 
-    ref
-        .read(evaluationServiceProvider)
-        .setOptions(
-          EvaluationOptions(
-            multiPv: ref.read(analysisPreferencesProvider).numEvalLines,
-            cores: numEngineCores,
-            searchTime: ref.read(analysisPreferencesProvider).engineSearchTime,
-          ),
-        );
+    ref.read(evaluationServiceProvider).setOptions(_evaluationOptions);
 
     _startEngineEval();
   }
@@ -451,15 +421,7 @@ class BroadcastGameController extends _$BroadcastGameController implements PgnTr
   void setEngineSearchTime(Duration searchTime) {
     ref.read(analysisPreferencesProvider.notifier).setEngineSearchTime(searchTime);
 
-    ref
-        .read(evaluationServiceProvider)
-        .setOptions(
-          EvaluationOptions(
-            multiPv: ref.read(analysisPreferencesProvider).numEvalLines,
-            cores: ref.read(analysisPreferencesProvider).numEngineCores,
-            searchTime: searchTime,
-          ),
-        );
+    ref.read(evaluationServiceProvider).setOptions(_evaluationOptions);
 
     _startEngineEval();
   }
@@ -540,10 +502,13 @@ class BroadcastGameController extends _$BroadcastGameController implements PgnTr
     }
   }
 
-  void _startEngineEval() {
+  Future<void> _startEngineEval() async {
     if (!state.hasValue) return;
 
     if (!state.requireValue.isLocalEvaluationEnabled) return;
+    await ref
+        .read(evaluationServiceProvider)
+        .ensureEngineInitialized(_evaluationContext, options: _evaluationOptions);
     ref
         .read(evaluationServiceProvider)
         .start(
@@ -552,7 +517,21 @@ class BroadcastGameController extends _$BroadcastGameController implements PgnTr
           initialPositionEval: _root.eval,
           shouldEmit: (work) => work.path == state.valueOrNull?.currentPath,
         )
-        ?.forEach((t) => _root.updateAt(t.$1.path, (node) => node.eval = t.$2));
+        ?.forEach((t) {
+          final (work, eval) = t;
+          _root.updateAt(work.path, (node) => node.eval = eval);
+          if (work.path == state.requireValue.currentPath && eval.searchTime >= work.searchTime) {
+            _refreshCurrentNode();
+          }
+        });
+  }
+
+  void _refreshCurrentNode() {
+    state = AsyncData(
+      state.requireValue.copyWith(
+        currentNode: AnalysisCurrentNode.fromNode(_root.nodeAt(state.requireValue.currentPath)),
+      ),
+    );
   }
 
   void _debouncedStartEngineEval() {
@@ -566,11 +545,7 @@ class BroadcastGameController extends _$BroadcastGameController implements PgnTr
 
     ref.read(evaluationServiceProvider).stop();
     // update the current node with last cached eval
-    state = AsyncData(
-      state.requireValue.copyWith(
-        currentNode: AnalysisCurrentNode.fromNode(_root.nodeAt(state.requireValue.currentPath)),
-      ),
-    );
+    _refreshCurrentNode();
   }
 
   ({Duration? parentClock, Duration? clock}) _getClocks(UciPath path) {
diff --git a/lib/src/model/engine/evaluation_service.dart b/lib/src/model/engine/evaluation_service.dart
index e2006aac28..63673738eb 100644
--- a/lib/src/model/engine/evaluation_service.dart
+++ b/lib/src/model/engine/evaluation_service.dart
@@ -49,6 +49,8 @@ class EvaluationService {
 
   /// Initialize the engine with the given context and options.
   ///
+  /// If the engine is already initialized, it is disposed first.
+  ///
   /// An optional [engineFactory] can be provided, it defaults to Stockfish.
   ///
   /// If [options] is not provided, the default options are used.
@@ -59,7 +61,7 @@ class EvaluationService {
     Engine Function() engineFactory = StockfishEngine.new,
     EvaluationOptions? options,
   }) async {
-    if (context != _context) {
+    if (_context != null || _engine != null) {
       await disposeEngine();
     }
     _context = context;
@@ -81,6 +83,17 @@ class EvaluationService {
     });
   }
 
+  /// Ensure the engine is initialized with the given context and options.
+  Future<void> ensureEngineInitialized(
+    EvaluationContext context, {
+    Engine Function() engineFactory = StockfishEngine.new,
+    EvaluationOptions? options,
+  }) async {
+    if (_engine == null || _context != context) {
+      await initEngine(context, engineFactory: engineFactory, options: options);
+    }
+  }
+
   void setOptions(EvaluationOptions options) {
     stop();
     _options = options;
diff --git a/lib/src/model/puzzle/puzzle_controller.dart b/lib/src/model/puzzle/puzzle_controller.dart
index 0353e41c9a..a28fd01021 100644
--- a/lib/src/model/puzzle/puzzle_controller.dart
+++ b/lib/src/model/puzzle/puzzle_controller.dart
@@ -447,8 +447,9 @@ class PuzzleController extends _$PuzzleController {
     return pgn;
   }
 
-  void _startEngineEval() {
+  Future<void> _startEngineEval() async {
     if (!state.isEngineEnabled) return;
+    await ref.read(evaluationServiceProvider).ensureEngineInitialized(state.evaluationContext);
     _engineEvalDebounce(
       () => ref
           .read(evaluationServiceProvider)
@@ -463,6 +464,9 @@ class PuzzleController extends _$PuzzleController {
             _gameTree.updateAt(work.path, (node) {
               node.eval = eval;
             });
+            if (work.path == state.currentPath && eval.searchTime >= work.searchTime) {
+              state = state.copyWith(node: _gameTree.branchAt(state.currentPath).view);
+            }
           }),
     );
   }
diff --git a/lib/src/model/study/study_controller.dart b/lib/src/model/study/study_controller.dart
index 6e2c2e6e73..7d44097006 100644
--- a/lib/src/model/study/study_controller.dart
+++ b/lib/src/model/study/study_controller.dart
@@ -137,14 +137,7 @@ class StudyController extends _$StudyController implements PgnTreeNotifier {
       await evaluationService.disposeEngine();
 
       evaluationService
-          .initEngine(
-            _evaluationContext(studyState.variant),
-            options: EvaluationOptions(
-              multiPv: prefs.numEvalLines,
-              cores: prefs.numEngineCores,
-              searchTime: ref.read(analysisPreferencesProvider).engineSearchTime,
-            ),
-          )
+          .initEngine(_evaluationContext(studyState.variant), options: _evaluationOptions)
           .then((_) {
             _startEngineEvalTimer = Timer(const Duration(milliseconds: 250), () {
               _startEngineEval();
@@ -200,6 +193,9 @@ class StudyController extends _$StudyController implements PgnTreeNotifier {
   EvaluationContext _evaluationContext(Variant variant) =>
       EvaluationContext(variant: variant, initialPosition: _root.position);
 
+  EvaluationOptions get _evaluationOptions =>
+      ref.read(analysisPreferencesProvider).evaluationOptions;
+
   void onUserMove(NormalMove move) {
     if (!state.hasValue || state.requireValue.position == null) return;
 
@@ -366,17 +362,9 @@ class StudyController extends _$StudyController implements PgnTreeNotifier {
     );
 
     if (state.requireValue.isEngineAvailable) {
-      final prefs = ref.read(analysisPreferencesProvider);
       await ref
           .read(evaluationServiceProvider)
-          .initEngine(
-            _evaluationContext(state.requireValue.variant),
-            options: EvaluationOptions(
-              multiPv: prefs.numEvalLines,
-              cores: prefs.numEngineCores,
-              searchTime: ref.read(analysisPreferencesProvider).engineSearchTime,
-            ),
-          );
+          .initEngine(_evaluationContext(state.requireValue.variant), options: _evaluationOptions);
       _startEngineEval();
     } else {
       _stopEngineEval();
@@ -389,15 +377,7 @@ class StudyController extends _$StudyController implements PgnTreeNotifier {
 
     ref.read(analysisPreferencesProvider.notifier).setNumEvalLines(numEvalLines);
 
-    ref
-        .read(evaluationServiceProvider)
-        .setOptions(
-          EvaluationOptions(
-            multiPv: numEvalLines,
-            cores: ref.read(analysisPreferencesProvider).numEngineCores,
-            searchTime: ref.read(analysisPreferencesProvider).engineSearchTime,
-          ),
-        );
+    ref.read(evaluationServiceProvider).setOptions(_evaluationOptions);
 
     _root.updateAll((node) => node.eval = null);
 
@@ -413,15 +393,7 @@ class StudyController extends _$StudyController implements PgnTreeNotifier {
   void setEngineCores(int numEngineCores) {
     ref.read(analysisPreferencesProvider.notifier).setEngineCores(numEngineCores);
 
-    ref
-        .read(evaluationServiceProvider)
-        .setOptions(
-          EvaluationOptions(
-            multiPv: ref.read(analysisPreferencesProvider).numEvalLines,
-            cores: numEngineCores,
-            searchTime: ref.read(analysisPreferencesProvider).engineSearchTime,
-          ),
-        );
+    ref.read(evaluationServiceProvider).setOptions(_evaluationOptions);
 
     _startEngineEval();
   }
@@ -429,15 +401,7 @@ class StudyController extends _$StudyController implements PgnTreeNotifier {
   void setEngineSearchTime(Duration searchTime) {
     ref.read(analysisPreferencesProvider.notifier).setEngineSearchTime(searchTime);
 
-    ref
-        .read(evaluationServiceProvider)
-        .setOptions(
-          EvaluationOptions(
-            multiPv: ref.read(analysisPreferencesProvider).numEvalLines,
-            cores: ref.read(analysisPreferencesProvider).numEngineCores,
-            searchTime: searchTime,
-          ),
-        );
+    ref.read(evaluationServiceProvider).setOptions(_evaluationOptions);
 
     _startEngineEval();
   }
@@ -514,20 +478,34 @@ class StudyController extends _$StudyController implements PgnTreeNotifier {
     }
   }
 
+  void _refreshCurrentNode() {
+    state = AsyncData(
+      state.requireValue.copyWith(
+        currentNode: StudyCurrentNode.fromNode(_root.nodeAt(state.requireValue.currentPath)),
+      ),
+    );
+  }
+
   void _startEngineEval() {
-    final state = this.state.valueOrNull;
-    if (state == null || !state.isEngineAvailable) return;
+    final curState = state.valueOrNull;
+    if (curState == null || !curState.isEngineAvailable) return;
 
     ref
         .read(evaluationServiceProvider)
         .start(
-          state.currentPath,
-          _root.branchesOn(state.currentPath).map(Step.fromNode),
+          curState.currentPath,
+          _root.branchesOn(curState.currentPath).map(Step.fromNode),
           // Note: AnalysisController passes _root.eval as initialPositionEval here,
           // but for studies this leads to false positive cache hits when switching between chapters.
-          shouldEmit: (work) => work.path == this.state.valueOrNull?.currentPath,
+          shouldEmit: (work) => work.path == state.valueOrNull?.currentPath,
         )
-        ?.forEach((t) => _root.updateAt(t.$1.path, (node) => node.eval = t.$2));
+        ?.forEach((t) {
+          final (work, eval) = t;
+          _root.updateAt(work.path, (node) => node.eval = eval);
+          if (work.path == state.requireValue.currentPath && eval.searchTime >= work.searchTime) {
+            _refreshCurrentNode();
+          }
+        });
   }
 
   void _debouncedStartEngineEval() {
@@ -542,11 +520,7 @@ class StudyController extends _$StudyController implements PgnTreeNotifier {
     if (!state.hasValue) return;
 
     // update the current node with last cached eval
-    state = AsyncValue.data(
-      state.requireValue.copyWith(
-        currentNode: StudyCurrentNode.fromNode(_root.nodeAt(state.requireValue.currentPath)),
-      ),
-    );
+    _refreshCurrentNode();
   }
 }