diff --git a/apps/files_sharing/lib/Updater.php b/apps/files_sharing/lib/Updater.php
index b110b2045f9d9..32751c7be6838 100644
--- a/apps/files_sharing/lib/Updater.php
+++ b/apps/files_sharing/lib/Updater.php
@@ -38,7 +38,7 @@ class Updater {
 	 */
 	public static function renameHook($params) {
 		self::renameChildren($params['oldpath'], $params['newpath']);
-		self::moveShareToShare($params['newpath']);
+		self::moveShareInOrOutOfShare($params['newpath']);
 	}
 
 	/**
@@ -51,7 +51,7 @@ public static function renameHook($params) {
 	 *
 	 * @param string $path
 	 */
-	private static function moveShareToShare($path) {
+	private static function moveShareInOrOutOfShare($path) {
 		$userFolder = \OC::$server->getUserFolder();
 
 		// If the user folder can't be constructed (e.g. link share) just return.
@@ -85,11 +85,6 @@ private static function moveShareToShare($path) {
 		// Check if the destination is inside a share
 		$mountManager = \OC::$server->getMountManager();
 		$dstMount = $mountManager->find($src->getPath());
-		if (!($dstMount instanceof \OCA\Files_Sharing\SharedMount)) {
-			return;
-		}
-
-		$newOwner = $dstMount->getShare()->getShareOwner();
 
 		//Ownership is moved over
 		foreach ($shares as $share) {
@@ -101,13 +96,20 @@ private static function moveShareToShare($path) {
 				continue;
 			}
 
-			/** @var IShare $share */
-			if (!($dstMount->getShare()->getPermissions() & Constants::PERMISSION_SHARE)) {
-				$shareManager->deleteShare($share);
-				continue;
+			if ($dstMount instanceof \OCA\Files_Sharing\SharedMount) {
+				if (!($dstMount->getShare()->getPermissions() & Constants::PERMISSION_SHARE)) {
+					$shareManager->deleteShare($share);
+					continue;
+				}
+				$newOwner = $dstMount->getShare()->getShareOwner();
+				$newPermissions = $share->getPermissions() & $dstMount->getShare()->getPermissions();
+			} else {
+				$newOwner = $userFolder->getOwner()->getUID();
+				$newPermissions = $share->getPermissions();
 			}
+
 			$share->setShareOwner($newOwner);
-			$share->setPermissions($share->getPermissions() & $dstMount->getShare()->getPermissions());
+			$share->setPermissions($newPermissions);
 			$shareManager->updateShare($share);
 		}
 	}
diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php
index 6e8d9105a7692..d9e977270d135 100644
--- a/lib/private/Share20/DefaultShareProvider.php
+++ b/lib/private/Share20/DefaultShareProvider.php
@@ -675,9 +675,11 @@ public function getSharesInFolder($userId, Folder $node, $reshares) {
 
 		$qb->orderBy('id');
 
-		$cursor = $qb->execute();
+		$cursor = $qb->executeQuery();
 		$shares = [];
 		while ($data = $cursor->fetch()) {
+			// Prevent permissions for oc_share to be shadowed by the one from oc_filecache.
+			$data['permissions'] = $data['s_permissions'];
 			$shares[$data['fileid']][] = $this->createShare($data);
 		}
 		$cursor->closeCursor();