diff --git a/lib/private/Files/FileInfo.php b/lib/private/Files/FileInfo.php
index 95de8be30ab..f8a071d320b 100644
--- a/lib/private/Files/FileInfo.php
+++ b/lib/private/Files/FileInfo.php
@@ -185,7 +185,11 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
 	 * @return string
 	 */
 	public function getName() {
-		return isset($this->data['name']) ? $this->data['name'] : basename($this->getPath());
+		if (isset($this->data['name']) && !empty($this->data['name'])) {
+			return $this->data['name'];
+		}
+
+		return basename($this->getPath());
 	}
 
 	/**