diff --git a/client/ui/frontend/src/modules/settings/SettingsNavigation.tsx b/client/ui/frontend/src/modules/settings/SettingsNavigation.tsx
index 4a218d97c..a48c4099d 100644
--- a/client/ui/frontend/src/modules/settings/SettingsNavigation.tsx
+++ b/client/ui/frontend/src/modules/settings/SettingsNavigation.tsx
@@ -46,13 +46,17 @@ export const SettingsNavigation = () => {
                             icon={ShieldIcon}
                             title={t("settings.tabs.security")}
                         />
-                        {!features.disableProfiles && (
-                            <VerticalTabs.Trigger
-                                value={"profiles"}
-                                icon={UserCircleIcon}
-                                title={t("settings.tabs.profiles")}
-                            />
-                        )}
+                    </>
+                )}
+                {!features.disableProfiles && (
+                    <VerticalTabs.Trigger
+                        value={"profiles"}
+                        icon={UserCircleIcon}
+                        title={t("settings.tabs.profiles")}
+                    />
+                )}
+                {!features.disableUpdateSettings && (
+                    <>
                         {!mdm.allowServerSSH && (
                             <VerticalTabs.Trigger
                                 value={"ssh"}
diff --git a/client/ui/frontend/src/modules/settings/SettingsPage.tsx b/client/ui/frontend/src/modules/settings/SettingsPage.tsx
index be17940b2..b41d37475 100644
--- a/client/ui/frontend/src/modules/settings/SettingsPage.tsx
+++ b/client/ui/frontend/src/modules/settings/SettingsPage.tsx
@@ -53,7 +53,7 @@ export const SettingsPage = () => {
             [Tab.General]: editable,
             [Tab.Network]: editable,
             [Tab.Security]: editable,
-            [Tab.Profiles]: editable && !features.disableProfiles,
+            [Tab.Profiles]: !features.disableProfiles,
             [Tab.SSH]: editable && !mdm.allowServerSSH,
             [Tab.Advanced]: editable,
             [Tab.Troubleshooting]: true,