diff --git a/app/assets/javascripts/discourse/components/groups-form-membership-fields.js.es6 b/app/assets/javascripts/discourse/components/groups-form-membership-fields.js.es6
index 6cf923d39d0..7a9849463a1 100644
--- a/app/assets/javascripts/discourse/components/groups-form-membership-fields.js.es6
+++ b/app/assets/javascripts/discourse/components/groups-form-membership-fields.js.es6
@@ -19,12 +19,12 @@ export default Ember.Component.extend({
   @computed("model.visibility_level", "model.public_admission")
   disableMembershipRequestSetting(visibility_level, publicAdmission) {
     visibility_level = parseInt(visibility_level);
-    return ![0, 1].includes(visibility_level) || publicAdmission;
+    return publicAdmission || visibility_level > 1;
   },
 
   @computed("model.visibility_level", "model.allow_membership_requests")
   disablePublicSetting(visibility_level, allowMembershipRequests) {
     visibility_level = parseInt(visibility_level);
-    return ![0, 1].includes(visibility_level) || allowMembershipRequests;
+    return allowMembershipRequests || visibility_level > 1;
   }
 });
diff --git a/app/assets/javascripts/discourse/models/group.js.es6 b/app/assets/javascripts/discourse/models/group.js.es6
index 383c46861b6..56394330a37 100644
--- a/app/assets/javascripts/discourse/models/group.js.es6
+++ b/app/assets/javascripts/discourse/models/group.js.es6
@@ -139,7 +139,7 @@ const Group = RestModel.extend({
 
   @computed("visibility_level")
   isPrivate(visibilityLevel) {
-    return ![0, 1].includes(visibilityLevel);
+    return visibility_level > 1;
   },
 
   @observes("isPrivate", "canEveryoneMention")