diff --git a/src/app/organizations/policies/single-org.component.ts b/src/app/organizations/policies/single-org.component.ts
index 24180d0831f..a7836d202c9 100644
--- a/src/app/organizations/policies/single-org.component.ts
+++ b/src/app/organizations/policies/single-org.component.ts
@@ -26,9 +26,14 @@ export class SingleOrgPolicyComponent extends BasePolicyComponent {
     }
 
     buildRequest(policiesEnabledMap: Map<PolicyType, boolean>): Promise<PolicyRequest> {
-        const requireSsoEnabled = policiesEnabledMap.get(PolicyType.RequireSso) ?? false;
-        if (!this.enabled.value && requireSsoEnabled) {
-            throw new Error(this.i18nService.t('disableRequireSsoError'));
+        if (!this.enabled.value) {
+            if (policiesEnabledMap.get(PolicyType.RequireSso) ?? false) {
+                throw new Error(this.i18nService.t('disableRequiredError', this.i18nService.t('requireSso')));
+            }
+
+            if (policiesEnabledMap.get(PolicyType.MaximumVaultTimeout) ?? false) {
+                throw new Error(this.i18nService.t('disableRequiredError', this.i18nService.t('maximumVaultTimeoutLabel')));
+            }
         }
 
         return super.buildRequest(policiesEnabledMap);
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 7aa5ab41a33..8fbc4a67ffe 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -3853,8 +3853,14 @@
   "manageResetPassword": {
     "message": "Manage Password Reset"
   },
-  "disableRequireSsoError": {
-    "message": "You must manually disable the Single Sign-On Authentication policy before this policy can be disabled."
+  "disableRequiredError": {
+    "message": "You must manually disable the $POLICYNAME$ policy before this policy can be disabled.",
+    "placeholders": {
+      "policyName": {
+        "content": "$1",
+        "example": "Single Sign-On Authentication"
+      }
+    }
   },
   "personalOwnershipPolicyInEffect": {
     "message": "An organization policy is affecting your ownership options."