diff --git a/apps/files/lib/Collaboration/Resources/ResourceProvider.php b/apps/files/lib/Collaboration/Resources/ResourceProvider.php
index 4609eda451f..d29b18afea3 100644
--- a/apps/files/lib/Collaboration/Resources/ResourceProvider.php
+++ b/apps/files/lib/Collaboration/Resources/ResourceProvider.php
@@ -52,6 +52,11 @@ class ResourceProvider implements IProvider {
 		if (isset($this->nodes[(int) $resource->getId()])) {
 			return $this->nodes[(int) $resource->getId()];
 		}
+		$nodes = $this->rootFolder->getById((int) $resource->getId());
+		if (!empty($nodes)) {
+			$this->nodes[(int) $resource->getId()] = array_shift($nodes);
+			return $this->nodes[(int) $resource->getId()];
+		}
 		return null;
 	}
 
@@ -66,6 +71,10 @@ class ResourceProvider implements IProvider {
 		if (isset($this->nodes[(int) $resource->getId()])) {
 			return $this->nodes[(int) $resource->getId()]->getPath();
 		}
+		$node = $this->getNode($resource);
+		if ($node) {
+			return $node->getName();
+		}
 		return '';
 	}