diff --git a/frontend/src/pages/organization/SettingsPage/components/OrgSsoTab/OrgSSOSection.tsx b/frontend/src/pages/organization/SettingsPage/components/OrgSsoTab/OrgSSOSection.tsx
index cce63cebf..d95a2f474 100644
--- a/frontend/src/pages/organization/SettingsPage/components/OrgSsoTab/OrgSSOSection.tsx
+++ b/frontend/src/pages/organization/SettingsPage/components/OrgSsoTab/OrgSSOSection.tsx
@@ -27,6 +27,7 @@ export const OrgSSOSection = (): JSX.Element => {
   const { mutateAsync } = useUpdateSSOConfig();
   const { popUp, handlePopUpOpen, handlePopUpClose, handlePopUpToggle } = usePopUp([
     "upgradePlan",
+    "upgradeEnterprisePlan",
     "addSSO"
   ] as const);
 
@@ -64,7 +65,7 @@ export const OrgSSOSection = (): JSX.Element => {
       if (!currentOrg?.id) return;
 
       if (!subscription?.samlSSO || !subscription?.groups) {
-        handlePopUpOpen("upgradePlan");
+        handlePopUpOpen("upgradeEnterprisePlan");
         return;
       }
 
@@ -215,7 +216,7 @@ export const OrgSSOSection = (): JSX.Element => {
                   id="enable-saml-group-sync"
                   isChecked={data?.enableGroupSync ?? false}
                   onCheckedChange={(value) => handleSamlGroupManagement(value)}
-                  isDisabled={!isAllowed || !subscription?.groups}
+                  isDisabled={!isAllowed}
                 />
               )}
             </OrgPermissionCan>
@@ -235,6 +236,11 @@ export const OrgSSOSection = (): JSX.Element => {
         onOpenChange={(isOpen) => handlePopUpToggle("upgradePlan", isOpen)}
         text="You can use SAML SSO if you switch to Infisical's Pro plan."
       />
+      <UpgradePlanModal
+        isOpen={popUp.upgradeEnterprisePlan.isOpen}
+        onOpenChange={(isOpen) => handlePopUpToggle("upgradeEnterprisePlan", isOpen)}
+        text="You can use SAML group mapping if you switch to Infisical's Enterprise plan."
+      />
     </div>
   );
 };