diff --git a/apps/files_sharing/lib/api.php b/apps/files_sharing/lib/api.php
index faf141db25f1954fa1218e45335e3359909065a9..8556036f1181485cb081043f2552779223ca08ad 100644
--- a/apps/files_sharing/lib/api.php
+++ b/apps/files_sharing/lib/api.php
@@ -64,7 +64,6 @@ class Api {
 						$share['isPreviewAvailable'] = true;
 					}
 				}
-				$newShares[] = $share;
 			}
 			return new \OC_OCS_Result($shares);
 		}
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index b8e7ffa4536287f10e32368c6b77cf85fc1b38b0..47b82f2a42d653f16a0cf4ad33273b797b4ddd9e 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -1388,7 +1388,8 @@ class Share extends \OC\Share\Constants {
 					}
 					if ($mounts[$row['storage']]) {
 						$path = $mounts[$row['storage']]->getMountPoint().$row['path'];
-						$row['path'] = substr($path, $root);
+						$relPath = substr($path, $root); // path relative to data/user
+						$row['path'] = rtrim($relPath, '/');
 					}
 				}
 			}