diff --git a/accessibility/methods.py b/accessibility/methods.py
index d3ca78add..e4bec2a31 100644
--- a/accessibility/methods.py
+++ b/accessibility/methods.py
@@ -17,7 +17,9 @@ def check_is_accessible(feature, cache_key, employee):
     if not employee:
         return False
 
-    accessibility = DefaultAccessibility.objects.filter(feature=feature).first()
+    accessibility = DefaultAccessibility.objects.filter(
+        feature=feature, is_enabled=True
+    ).first()
 
     if accessibility and accessibility.exclude_all:
         return False
diff --git a/accessibility/models.py b/accessibility/models.py
index 12552df69..49bd4af7b 100644
--- a/accessibility/models.py
+++ b/accessibility/models.py
@@ -20,3 +20,4 @@ class DefaultAccessibility(HorillaModel):
     employees = models.ManyToManyField(
         Employee, blank=True, related_name="default_accessibility"
     )
+    is_enabled = models.BooleanField(default=True)
diff --git a/base/views.py b/base/views.py
index 855d1a8bb..1a420b296 100644
--- a/base/views.py
+++ b/base/views.py
@@ -5402,6 +5402,12 @@ def enable_profile_edit_feature(request):
             DefaultAccessibility.objects.create(
                 feature="profile_edit", filter={"feature": ["profile_edit"]}
             )
+        elif not enabled and feature:
+            feature.is_enabled = False
+            feature.save()
+        elif enabled and feature:
+            feature.is_enabled = True
+            feature.save()
 
         if enabled:
             if not any(item[0] == "profile_edit" for item in ACCESSBILITY_FEATURE):