diff --git a/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcDashboard.tsx b/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcDashboard.tsx
index 45779ea05ed70..98f5faa122bd4 100644
--- a/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcDashboard.tsx
+++ b/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcDashboard.tsx
@@ -28,7 +28,7 @@ export function AwsOidcDashboard() {
 
   return (
     <FeatureBox css={{ maxWidth: '1400px', paddingTop: '16px' }}>
-      <AwsOidcHeader integration={attempt.data} />
+      {attempt.data && <AwsOidcHeader integration={attempt.data} />}
       Status for integration type aws-oidc is not supported
     </FeatureBox>
   );
diff --git a/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcHeader.tsx b/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcHeader.tsx
index 136e3ee354e09..8d95d16a691c4 100644
--- a/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcHeader.tsx
+++ b/web/packages/teleport/src/Integrations/status/AwsOidc/AwsOidcHeader.tsx
@@ -27,11 +27,7 @@ import cfg from 'teleport/config';
 import { getStatusAndLabel } from 'teleport/Integrations/helpers';
 import { Integration } from 'teleport/services/integrations';
 
-export function AwsOidcHeader({
-  integration,
-}: {
-  integration: Integration | null;
-}) {
+export function AwsOidcHeader({ integration }: { integration: Integration }) {
   const { status, labelKind } = getStatusAndLabel(integration);
   return (
     <Flex alignItems="center">
@@ -45,7 +41,7 @@ export function AwsOidcHeader({
         </ButtonIcon>
       </HoverTooltip>
       <Text bold fontSize={6} mr={2}>
-        {integration?.name}
+        {integration.name}
       </Text>
       <Label kind={labelKind} aria-label="status" px={3}>
         {status}
diff --git a/web/packages/teleport/src/features.tsx b/web/packages/teleport/src/features.tsx
index 61c6dffe7eee7..199642a6bd410 100644
--- a/web/packages/teleport/src/features.tsx
+++ b/web/packages/teleport/src/features.tsx
@@ -47,6 +47,9 @@ import {
 } from 'teleport/Navigation/categories';
 import { IntegrationEnroll } from '@gravitational/teleport/src/Integrations/Enroll';
 
+import { IntegrationStatus } from 'teleport/Integrations/IntegrationStatus';
+
+import type { FeatureFlags, TeleportFeature } from './types';
 import { NavTitle } from './types';
 
 import { AuditContainer as Audit } from './Audit';
@@ -70,8 +73,6 @@ import { Bots } from './Bots';
 import { AddBots } from './Bots/Add';
 import { JoinTokens } from './JoinTokens/JoinTokens';
 
-import type { FeatureFlags, TeleportFeature } from './types';
-
 class AccessRequests implements TeleportFeature {
   category = NavigationCategory.Resources;
 
@@ -566,6 +567,22 @@ class FeatureDeviceTrust implements TeleportFeature {
   };
 }
 
+class FeatureIntegrationStatus implements TeleportFeature {
+  category = NavigationCategory.Management;
+
+  parent = FeatureIntegrations;
+
+  route = {
+    title: 'Integration Status',
+    path: cfg.routes.integrationStatus,
+    component: IntegrationStatus,
+  };
+
+  hasAccess() {
+    return true;
+  }
+}
+
 // ****************************
 // Other Features
 // ****************************
@@ -630,6 +647,7 @@ export function getOSSFeatures(): TeleportFeature[] {
     new FeatureJoinTokens(),
     new FeatureDiscover(),
     new FeatureIntegrationEnroll(),
+    new FeatureIntegrationStatus(),
 
     // - Permissions
     new FeatureRoles(),