diff --git a/lib/private/Files/Cache/Storage.php b/lib/private/Files/Cache/Storage.php
index d6405d3fbee6..500eb1dc78f1 100644
--- a/lib/private/Files/Cache/Storage.php
+++ b/lib/private/Files/Cache/Storage.php
@@ -109,7 +109,7 @@ public static function getStorageById($storageId) {
 			self::$localCache = new CappedMemoryCache();
 		}
 		$result = self::$localCache->get($storageId);
-		if ($result === null) {
+		if ($result === null || !isset($result['numeric_id'])) {
 			$result = self::getStorageByIdFromCache($storageId);
 			self::$localCache->set($storageId, $result);
 		}
@@ -134,7 +134,7 @@ private static function getDistributedCache() {
 	 */
 	private static function getStorageByIdFromCache($storageId) {
 		$result = self::getDistributedCache()->get($storageId);
-		if ($result === null) {
+		if ($result === null || !isset($result['numeric_id'])) {
 			$result = self::getStorageByIdFromDb($storageId);
 			self::getDistributedCache()->set(
 				$storageId,	$result, self::$distributedCacheTTL