diff --git a/domain/space/endpoint.go b/domain/space/endpoint.go
index 2e000a9b..a77c3b25 100644
--- a/domain/space/endpoint.go
+++ b/domain/space/endpoint.go
@@ -641,12 +641,13 @@ func (h *Handler) SetPermissions(w http.ResponseWriter, r *http.Request) {
 			me = true
 		}
 
-		if len(perm.UserID) == 0 {
-			hasEveryoneRole = true
-		}
-
 		// Only persist if there is a role!
 		if space.HasAnyPermission(perm) {
+			// identify publically shared spaces
+			if len(perm.UserID) == 0 {
+				hasEveryoneRole = true
+			}
+
 			r := space.EncodeUserPermissions(perm)
 
 			for _, p := range r {
diff --git a/gui/app/components/folder/permission-admin.js b/gui/app/components/folder/permission-admin.js
index f0dcae44..847a1b13 100644
--- a/gui/app/components/folder/permission-admin.js
+++ b/gui/app/components/folder/permission-admin.js
@@ -120,8 +120,6 @@ export default Ember.Component.extend(NotifierMixin, {
 					this.showNotification('Marked space as private');
 				}
 			}
-
-			// this.get('folderService').save(folder).then(function () {});
 		}
 	}
 });