diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index a7764dd626..a28bcac91c 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -46,6 +46,7 @@
 	 * @property {string} mail_send
 	 * @property {Date} expiration optional?
 	 * @property {number} stime optional?
+	 * @property {string} uid_owner
 	 */
 
 	/**
@@ -725,6 +726,14 @@
 						|| share.item_source === this.get('itemSource'));
 
 					if (isShareLink) {
+						/*
+						 * Ignore reshared link shares for now
+						 * FIXME: Find a way to display properly
+						 */
+						if (share.uid_owner !== OC.currentUser) {
+							return share;
+						}
+
 						var link = window.location.protocol + '//' + window.location.host;
 						if (!share.token) {
 							// pre-token link
diff --git a/core/js/tests/specs/shareitemmodelSpec.js b/core/js/tests/specs/shareitemmodelSpec.js
index b2480a8bea..8c9560d264 100644
--- a/core/js/tests/specs/shareitemmodelSpec.js
+++ b/core/js/tests/specs/shareitemmodelSpec.js
@@ -164,6 +164,8 @@ describe('OC.Share.ShareItemModel', function() {
 				}
 			]));
 
+			OC.currentUser = 'root';
+
 			model.fetch();
 
 			var shares = model.get('shares');
@@ -253,7 +255,7 @@ describe('OC.Share.ShareItemModel', function() {
 					uid_owner: 'root'
 				}]
 			));
-
+			OC.currentUser = 'root';
 			model.fetch();
 
 			var shares = model.get('shares');
@@ -443,7 +445,7 @@ describe('OC.Share.ShareItemModel', function() {
 				token: 'tehtoken',
 				uid_owner: 'root'
 			}]));
-
+			OC.currentUser = 'root';
 			model.fetch();
 
 			var res = model.sendEmailPrivateLink('foo@bar.com');
@@ -493,7 +495,7 @@ describe('OC.Share.ShareItemModel', function() {
 				token: 'tehtoken',
 				uid_owner: 'root'
 			}]));
-
+			OC.currentUser = 'root';
 			model.fetch();
 
 			var res = model.sendEmailPrivateLink('foo@bar.com');