diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverview.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverview.tsx
index 6e7893be32..9dd63acc4b 100644
--- a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverview.tsx
+++ b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverview.tsx
@@ -53,7 +53,10 @@ export const FeatureOverview = () => {
     const { splash } = useAuthSplash();
     const [showTooltip, setShowTooltip] = useState(false);
     const [hasClosedTooltip, setHasClosedTooltip] = useState(false);
-    const { feature, refetchFeature } = useFeature(projectId, featureId);
+    const { feature, refetchFeature, loading } = useFeature(
+        projectId,
+        featureId,
+    );
     const cleanupReminderEnabled = useUiFlag('cleanupReminder');
     const dragTooltipSplashId = 'strategy-drag-tooltip';
     const shouldShowStrategyDragTooltip = !splash?.[dragTooltipSplashId];
@@ -74,14 +77,16 @@ export const FeatureOverview = () => {
             ) : null}
             <StyledContainer>
                 <div>
-                    <FeatureOverviewMetaData
-                        hiddenEnvironments={hiddenEnvironments}
-                        onEnvironmentVisibilityChange={
-                            onEnvironmentVisibilityChange
-                        }
-                        feature={feature}
-                        onChange={refetchFeature}
-                    />
+                    {!loading ? (
+                        <FeatureOverviewMetaData
+                            hiddenEnvironments={hiddenEnvironments}
+                            onEnvironmentVisibilityChange={
+                                onEnvironmentVisibilityChange
+                            }
+                            feature={feature}
+                            onChange={refetchFeature}
+                        />
+                    ) : null}
                 </div>
                 <StyledMainContent>
                     <FeatureOverviewEnvironments
diff --git a/frontend/src/hooks/api/getters/useFeature/useFeature.ts b/frontend/src/hooks/api/getters/useFeature/useFeature.ts
index 46f8bf1b16..e5b19a6a63 100644
--- a/frontend/src/hooks/api/getters/useFeature/useFeature.ts
+++ b/frontend/src/hooks/api/getters/useFeature/useFeature.ts
@@ -1,10 +1,9 @@
-import type { SWRConfiguration } from 'swr';
+import useSWR, { type SWRConfiguration } from 'swr';
 import { useCallback } from 'react';
 import { emptyFeature } from './emptyFeature.ts';
 import handleErrorResponses from '../httpErrorResponseHandler.ts';
 import { formatApiPath } from 'utils/formatPath';
 import type { IFeatureToggle } from 'interfaces/featureToggle';
-import { useConditionalSWR } from '../useConditionalSWR/useConditionalSWR.ts';
 
 export interface IUseFeatureOutput {
     feature: IFeatureToggle;
@@ -26,9 +25,7 @@ export const useFeature = (
 ): IUseFeatureOutput => {
     const path = formatFeatureApiPath(projectId, featureId);
 
-    const { data, error, mutate } = useConditionalSWR<IFeatureResponse>(
-        Boolean(featureId && projectId),
-        { status: 404 },
+    const { data, error, mutate } = useSWR<IFeatureResponse>(
         ['useFeature', path],
         () => featureFetcher(path),
         options,