diff --git a/Neos.ContentRepository.Core/Classes/Feature/Common/ContentStreamIdOverride.php b/Neos.ContentRepository.Core/Classes/Feature/Common/ContentStreamIdOverride.php
index 3944bb1f06e..96e15bc4f48 100644
--- a/Neos.ContentRepository.Core/Classes/Feature/Common/ContentStreamIdOverride.php
+++ b/Neos.ContentRepository.Core/Classes/Feature/Common/ContentStreamIdOverride.php
@@ -40,9 +40,8 @@ public static function withContentStreamIdToUse(ContentStreamId $contentStreamId
         self::$contentStreamIdToUse = $contentStreamIdToUse;
         try {
             $fn();
-        } catch (\Throwable $th) {
+        } finally {
             self::$contentStreamIdToUse = null;
-            throw $th;
         }
         self::$contentStreamIdToUse = null;
     }