diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index 9e3c152f2ada9..fce25053b3c25 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -3654,12 +3654,6 @@
       <code><![CDATA[$this->cache instanceof Cache]]></code>
     </RedundantCondition>
   </file>
-  <file src="lib/private/Files/Cache/Wrapper/CacheWrapper.php">
-    <LessSpecificImplementedReturnType>
-      <code><![CDATA[array]]></code>
-      <code><![CDATA[array]]></code>
-    </LessSpecificImplementedReturnType>
-  </file>
   <file src="lib/private/Files/Config/MountProviderCollection.php">
     <InvalidOperand>
       <code><![CDATA[$user]]></code>
diff --git a/lib/private/Files/Cache/Wrapper/CacheWrapper.php b/lib/private/Files/Cache/Wrapper/CacheWrapper.php
index bf23f1cc30ab0..8d48fd2ddaa90 100644
--- a/lib/private/Files/Cache/Wrapper/CacheWrapper.php
+++ b/lib/private/Files/Cache/Wrapper/CacheWrapper.php
@@ -100,14 +100,14 @@ public function getFolderContents($folder) {
 	}
 
 	/**
-	 * get the metadata of all files stored in $folder
+	 * Get the metadata of all files stored in given folder
 	 *
 	 * @param int $fileId the file id of the folder
-	 * @return array
+	 * @return ICacheEntry[]
 	 */
 	public function getFolderContentsById($fileId) {
 		$results = $this->getCache()->getFolderContentsById($fileId);
-		return array_map([$this, 'formatCacheEntry'], $results);
+		return array_filter(array_map($this->formatCacheEntry(...), $results));
 	}
 
 	/**