diff --git a/apps/files_sharing/lib_share.php b/apps/files_sharing/lib_share.php
index 02e4b6e4c26532a5e714cf6d49b84ed8af9c5ef9..73ddaf0b9ea8e2b8cf162df6c0c1bae7bb7d1205 100755
--- a/apps/files_sharing/lib_share.php
+++ b/apps/files_sharing/lib_share.php
@@ -41,6 +41,10 @@ class OC_Share {
 	public function __construct($source, $uid_shared_with, $permissions) {
 		$uid_owner = OCP\USER::getUser();
 		$query = OCP\DB::prepare("INSERT INTO *PREFIX*sharing VALUES(?,?,?,?,?)");
+		// Check if this is a reshare and use the original source
+		if ($result = OC_Share::getSource($source)) {
+			$source = $result;
+		}
 		if ($uid_shared_with == self::PUBLICLINK) {
 			$token = sha1("$uid_shared_with-$source");
 			$query->execute(array($uid_owner, self::PUBLICLINK, $source, $token, $permissions));