diff --git a/changes/43643-conditional-access-header-fleet-free b/changes/43643-conditional-access-header-fleet-free
new file mode 100644
index 0000000000..f3b176f3b9
--- /dev/null
+++ b/changes/43643-conditional-access-header-fleet-free
@@ -0,0 +1 @@
+- Fixed missing "Conditional access" section header on the Settings > Integrations > Conditional access page on Fleet Free.
diff --git a/frontend/pages/admin/IntegrationsPage/cards/ConditionalAccess/ConditionalAccess.tests.tsx b/frontend/pages/admin/IntegrationsPage/cards/ConditionalAccess/ConditionalAccess.tests.tsx
index ce00db10dc..37534d7974 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/ConditionalAccess/ConditionalAccess.tests.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/ConditionalAccess/ConditionalAccess.tests.tsx
@@ -471,5 +471,25 @@ BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
screen.getByText(/This feature is included in Fleet Premium/i)
).toBeInTheDocument();
});
+
+ it("Renders the 'Conditional access' section header on Fleet Free", () => {
+ const render = createCustomRenderer({
+ withBackendMock: true,
+ context: {
+ app: {
+ isPremiumTier: false,
+ },
+ },
+ });
+
+ render();
+
+ expect(
+ screen.getByRole("heading", {
+ level: 2,
+ name: /Conditional access/i,
+ })
+ ).toBeInTheDocument();
+ });
});
});
diff --git a/frontend/pages/admin/IntegrationsPage/cards/ConditionalAccess/ConditionalAccess.tsx b/frontend/pages/admin/IntegrationsPage/cards/ConditionalAccess/ConditionalAccess.tsx
index 5c3f91ba1f..91b264f3ed 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/ConditionalAccess/ConditionalAccess.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/ConditionalAccess/ConditionalAccess.tsx
@@ -30,6 +30,8 @@ import TooltipWrapper from "components/TooltipWrapper";
import { IConfig, isOktaConditionalAccessConfigured } from "interfaces/config";
import { IInputFieldParseTarget } from "interfaces/form_field";
+import SettingsSection from "pages/admin/components/SettingsSection";
+
import SectionCard from "../MdmSettings/components/SectionCard";
import EntraConditionalAccessModal from "./components/EntraConditionalAccessModal";
import OktaConditionalAccessModal from "./components/OktaConditionalAccessModal";
@@ -296,7 +298,11 @@ const ConditionalAccess = () => {
}, [entraTenantId, entraConfigured, entraPhase]);
if (!isPremiumTier) {
- return ;
+ return (
+
+
+
+ );
}
// HANDLERS