diff --git a/typo3/sysext/extbase/Tests/Unit/Configuration/FrontendConfigurationManagerTest.php b/typo3/sysext/extbase/Tests/Unit/Configuration/FrontendConfigurationManagerTest.php
index 65045e04c51e1901178cdeb855fede598bf885b5..f1797945549670e6b83364217ab7e37d95d511ea 100644
--- a/typo3/sysext/extbase/Tests/Unit/Configuration/FrontendConfigurationManagerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Configuration/FrontendConfigurationManagerTest.php
@@ -450,6 +450,21 @@ class FrontendConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
         );
     }
 
+    /**
+     * @test
+     */
+    public function overrideStoragePidIfStartingPointIsSetCorrectlyHandlesEmptyValuesFromGetTreeList()
+    {
+        $this->mockContentObject->expects($this->any())->method('getTreeList')->will($this->returnValue(''));
+        $this->mockContentObject->data = array('pages' => '0', 'recursive' => 1);
+
+        $frameworkConfiguration = array('persistence' => array('storagePid' => '98'));
+        $this->assertSame(
+            array('persistence' => array('storagePid' => '0')),
+            $this->frontendConfigurationManager->_call('overrideStoragePidIfStartingPointIsSet', $frameworkConfiguration)
+        );
+    }
+
     /**
      * @test
      */