diff --git a/typo3/sysext/fluid/Classes/View/TemplatePaths.php b/typo3/sysext/fluid/Classes/View/TemplatePaths.php
index 5c4b665b80d58380ecf70f1b7f9758092c562293..173bb63a4c2d7d2f1acf1a8377655b931381362f 100644
--- a/typo3/sysext/fluid/Classes/View/TemplatePaths.php
+++ b/typo3/sysext/fluid/Classes/View/TemplatePaths.php
@@ -115,6 +115,10 @@ class TemplatePaths extends \TYPO3Fluid\Fluid\View\TemplatePaths
             }
         }
 
+        if (empty($configuredPaths)) {
+            return $paths;
+        }
+
         foreach ($paths as $name => $defaultPaths) {
             if (!empty($configuredPaths[$name])) {
                 $paths[$name] = $defaultPaths + (array)$configuredPaths[$name];
@@ -122,6 +126,7 @@ class TemplatePaths extends \TYPO3Fluid\Fluid\View\TemplatePaths
         }
 
         $cache->set($cacheIdentifier, $paths);
+
         return $paths;
     }