diff --git a/interface/src/contexts/features/FeaturesLoader.tsx b/interface/src/contexts/features/FeaturesLoader.tsx
index 985ac30cf..38e5e0196 100644
--- a/interface/src/contexts/features/FeaturesLoader.tsx
+++ b/interface/src/contexts/features/FeaturesLoader.tsx
@@ -9,15 +9,17 @@ import * as FeaturesApi from 'api/features';
 const FeaturesLoader: FC<RequiredChildrenProps> = (props) => {
   const { data: features } = useRequest(FeaturesApi.readFeatures);
 
-  return (
-    <FeaturesContext.Provider
-      value={{
-        features
-      }}
-    >
-      {props.children}
-    </FeaturesContext.Provider>
-  );
+  if (features) {
+    return (
+      <FeaturesContext.Provider
+        value={{
+          features
+        }}
+      >
+        {props.children}
+      </FeaturesContext.Provider>
+    );
+  }
 };
 
 export default FeaturesLoader;