diff --git a/apps/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php
index 9d2e0c91099fc..ea7ca42dfefbc 100644
--- a/apps/files_external/lib/Lib/Storage/AmazonS3.php
+++ b/apps/files_external/lib/Lib/Storage/AmazonS3.php
@@ -309,7 +309,7 @@ public function opendir($path) {
 						$files[] = $file;
 
 						// store this information for later usage
-						$this->filesCache[$file] = [
+						$this->filesCache[$path . $file] = [
 							'ContentLength' => $object['Size'],
 							'LastModified' => (string)$object['LastModified'],
 						];
@@ -408,7 +408,7 @@ public function filetype($path) {
 		}
 
 		try {
-			if ($this->headObject($path)) {
+			if (isset($this->filesCache[$path]) || $this->headObject($path)) {
 				return 'file';
 			}
 			if ($this->headObject($path . '/')) {