diff --git a/apps/files_sharing/lib/API/Share20OCS.php b/apps/files_sharing/lib/API/Share20OCS.php
index 90e1f19130..53b27aae0b 100644
--- a/apps/files_sharing/lib/API/Share20OCS.php
+++ b/apps/files_sharing/lib/API/Share20OCS.php
@@ -100,15 +100,8 @@ class Share20OCS {
 	 */
 	protected function formatShare(\OCP\Share\IShare $share) {
 		$sharedBy = $this->userManager->get($share->getSharedBy());
-		// for federated shares the owner can be a remote user, in this
-		// case we use the initiator
-		if ($this->userManager->userExists($share->getShareOwner())) {
-			$shareOwner = $this->userManager->get($share->getShareOwner());
-			$localUser = $share->getShareOwner();
-		} else {
-			$shareOwner = $this->userManager->get($share->getSharedBy());
-			$localUser = $share->getSharedBy();
-		}
+		$shareOwner = $this->userManager->get($share->getShareOwner());
+
 		$result = [
 			'id' => $share->getId(),
 			'share_type' => $share->getShareType(),
@@ -123,8 +116,16 @@ class Share20OCS {
 			'displayname_file_owner' => $shareOwner !== null ? $shareOwner->getDisplayName() : $share->getShareOwner(),
 		];
 
-		$node = $share->getNode();
-		$result['path'] = $this->rootFolder->getUserFolder($localUser)->getRelativePath($node->getPath());
+		$userFolder = $this->rootFolder->getUserFolder($this->currentUser->getUID());
+		$nodes = $userFolder->getById($share->getNodeId());
+
+		if (empty($nodes)) {
+			throw new NotFoundException();
+		}
+
+		$node = $nodes[0];
+
+		$result['path'] = $userFolder->getRelativePath($node->getPath());
 		if ($node instanceOf \OCP\Files\Folder) {
 			$result['item_type'] = 'folder';
 		} else {
@@ -536,7 +537,6 @@ class Share20OCS {
 			$shares = array_merge($shares, $federatedShares);
 		}
 
-
 		$formatted = [];
 		foreach ($shares as $share) {
 			try {