diff --git a/client/ui/frontend/src/contexts/SettingsContext.tsx b/client/ui/frontend/src/contexts/SettingsContext.tsx
index c6c21437c..d222d1d28 100644
--- a/client/ui/frontend/src/contexts/SettingsContext.tsx
+++ b/client/ui/frontend/src/contexts/SettingsContext.tsx
@@ -8,6 +8,7 @@ import {
     useState,
     type ReactNode,
 } from "react";
+import { Events } from "@wailsio/runtime";
 import { Autostart, Settings as SettingsSvc, Version } from "@bindings/services";
 import type { Config } from "@bindings/services/models.js";
 import i18next from "@/lib/i18n";
@@ -70,24 +71,37 @@ const useSettingsState = () => {
     useEffect(() => {
         if (!profileLoaded || !activeProfile) return;
         let cancelled = false;
-        (async () => {
+
+        const load = async (showError: boolean) => {
             try {
                 const data = await SettingsSvc.GetConfig({
                     profileName: activeProfile,
                     username,
                 });
                 if (cancelled) return;
+                if (saveTimer.current) return;
                 setLoaded({ profileName: activeProfile, data });
             } catch (e) {
-                if (cancelled) return;
+                if (cancelled || !showError) return;
                 await errorDialog({
                     Title: i18next.t("settings.error.loadTitle"),
                     Message: errorMessage(e),
                 });
             }
-        })();
+        };
+
+        load(true);
+
+        const off = Events.On(
+            "netbird:event",
+            (e: { data?: { metadata?: { [k: string]: string | undefined } } }) => {
+                if (e.data?.metadata?.type === "config_changed") load(false);
+            },
+        );
+
         return () => {
             cancelled = true;
+            off();
         };
     }, [profileLoaded, activeProfile, username]);
 
@@ -140,6 +154,7 @@ const useSettingsState = () => {
             setLoaded(next);
             if (saveTimer.current) clearTimeout(saveTimer.current);
             saveTimer.current = setTimeout(() => {
+                saveTimer.current = null;
                 save(next.profileName, next.data).catch(logSaveError);
             }, SAVE_DEBOUNCE_MS);
         },
diff --git a/client/ui/frontend/src/modules/settings/SettingsSecurity.tsx b/client/ui/frontend/src/modules/settings/SettingsSecurity.tsx
index ccdc8e408..db1ad9c8f 100644
--- a/client/ui/frontend/src/modules/settings/SettingsSecurity.tsx
+++ b/client/ui/frontend/src/modules/settings/SettingsSecurity.tsx
@@ -8,7 +8,10 @@ export function SettingsSecurity() {
     const { t } = useTranslation();
     const { config, setField } = useSettings();
     const { mdm } = useRestrictions();
-    const showEncryptionSection = !(mdm.rosenpassEnabled && mdm.rosenpassPermissive);
+    const hideRosenpassEnabled = mdm.rosenpassEnabled;
+    const hideRosenpassPermissive =
+        mdm.rosenpassPermissive || (mdm.rosenpassEnabled && !config.rosenpassEnabled);
+    const showEncryptionSection = !(hideRosenpassEnabled && hideRosenpassPermissive);
 
     return (
         <>
@@ -31,7 +34,7 @@ export function SettingsSecurity() {
 
             {showEncryptionSection && (
                 <SectionGroup title={t("settings.security.section.encryption")}>
-                    {!mdm.rosenpassEnabled && (
+                    {!hideRosenpassEnabled && (
                         <FancyToggleSwitch
                             value={config.rosenpassEnabled}
                             onChange={(v) => {
@@ -42,7 +45,7 @@ export function SettingsSecurity() {
                             helpText={t("settings.security.rosenpass.help")}
                         />
                     )}
-                    {!mdm.rosenpassPermissive && (
+                    {!hideRosenpassPermissive && (
                         <FancyToggleSwitch
                             value={config.rosenpassPermissive}
                             onChange={(v) => setField("rosenpassPermissive", v)}