diff --git a/Classes/Core/Functional/Framework/Frontend/Collector.php b/Classes/Core/Functional/Framework/Frontend/Collector.php
index 02670b18..fc3493e8 100644
--- a/Classes/Core/Functional/Framework/Frontend/Collector.php
+++ b/Classes/Core/Functional/Framework/Frontend/Collector.php
@@ -142,12 +142,13 @@ private function getTableFields(string $tableName, ServerRequestInterface $reque
 
     private function getCurrentWatcherValue(ServerRequestInterface $request): ?string
     {
-        $watcherValue = null;
-        $tsfe = $request->getAttribute('frontend.controller');
-        if (isset($tsfe->register['watcher'])) {
-            $watcherValue = $tsfe->register['watcher'];
+        $registerStack = $request->getAttribute('frontend.register.stack');
+        if ($registerStack !== null) {
+            return $registerStack->current()->get('watcher');
         }
-        return $watcherValue;
+        // @deprecated: TYPO3 <v14 b/w compat. Remove $tsfe fallback and if clause above when v13 compat is removed.
+        $tsfe = $request->getAttribute('frontend.controller');
+        return $tsfe->register['watcher'] ?? null;
     }
 
     private function getRenderer(): Renderer