diff --git a/typo3/sysext/backend/Classes/Tree/FileStorageTreeProvider.php b/typo3/sysext/backend/Classes/Tree/FileStorageTreeProvider.php
index 3643d4adb53532fd382df1138c411359849760f0..86cc43a099eba11ee91cdd5f652bfcb1d912e954 100644
--- a/typo3/sysext/backend/Classes/Tree/FileStorageTreeProvider.php
+++ b/typo3/sysext/backend/Classes/Tree/FileStorageTreeProvider.php
@@ -209,7 +209,7 @@ class FileStorageTreeProvider
             }
 
             $items[] = array_merge(
-                $this->prepareFolderInformation($subFolder, is_string($subFolderName) ? $subFolderName : null),
+                $this->prepareFolderInformation($subFolder, $subFolderName),
                 [
                     'depth' => $currentDepth,
                     'expanded' => $expanded,
diff --git a/typo3/sysext/core/Classes/Resource/Utility/ListUtility.php b/typo3/sysext/core/Classes/Resource/Utility/ListUtility.php
index 5f699ed9bdce2a910cd9139515028da8096ff95f..b5a6530c6e4051f593e2c172fa7c704de2bb93e7 100644
--- a/typo3/sysext/core/Classes/Resource/Utility/ListUtility.php
+++ b/typo3/sysext/core/Classes/Resource/Utility/ListUtility.php
@@ -28,7 +28,7 @@ class ListUtility
      * Resolve special folders (by their role) into localised string
      *
      * @param Folder[] $folders
-     * @return array Array of \TYPO3\CMS\Core\Resource\Folder; folder name or role with folder name as keys
+     * @return array<string, Folder> array with Folders using the Folder name (with our without role) as key
      */
     public static function resolveSpecialFolderNames(array $folders)
     {