diff --git a/apps/ensadmin/src/components/connection/config-info/app-card.tsx b/apps/ensadmin/src/components/connection/config-info/app-card.tsx
index 6d7ceb7ac..817fc1d73 100644
--- a/apps/ensadmin/src/components/connection/config-info/app-card.tsx
+++ b/apps/ensadmin/src/components/connection/config-info/app-card.tsx
@@ -15,7 +15,6 @@ export interface ConfigInfoItemProps {
 export interface ConfigInfoFeatureProps {
   label: string;
   description: ReactNode;
-  isActivated?: boolean;
   icon: ReactElement;
 }
 
@@ -69,12 +68,7 @@ export function ConfigInfoItem({ label, value, additionalInfo }: ConfigInfoItemP
 /**
  * ConfigInfoFeature - Renders a single feature badge with tooltip
  */
-export function ConfigInfoFeature({
-  label,
-  description,
-  isActivated = true,
-  icon,
-}: ConfigInfoFeatureProps) {
+export function ConfigInfoFeature({ label, description, icon }: ConfigInfoFeatureProps) {
   return (
     <div className="max-sm:w-full flex flex-row flex-nowrap justify-start max-sm:justify-between items-center gap-1">
       <div className={featureActivationsWrapperStyles}>
diff --git a/apps/ensadmin/src/components/connection/config-info/config-info.tsx b/apps/ensadmin/src/components/connection/config-info/config-info.tsx
index 2fe0b6973..c23e931c2 100644
--- a/apps/ensadmin/src/components/connection/config-info/config-info.tsx
+++ b/apps/ensadmin/src/components/connection/config-info/config-info.tsx
@@ -226,6 +226,61 @@ function ENSNodeConfigCardContent({
     </p>
   );
 
+  const healReverseAddressesFeature = (
+    <ConfigInfoFeature
+      label="Heal Reverse Addresses"
+      key="ENSIndexer Heal Reverse Addresses feature"
+      description={healReverseAddressesDescription}
+      icon={<HealIcon width={15} height={15} className="flex-shrink-0" />}
+    />
+  );
+
+  const indexAdditionalRecordsFeature = (
+    <ConfigInfoFeature
+      label="Index Additional Resolver Records"
+      key="ENSIndexer Index Additional Resolver Records feature"
+      description={indexAdditionalRecordsDescription}
+      icon={<IndexAdditionalRecordsIcon width={15} height={15} className="flex-shrink-0" />}
+    />
+  );
+
+  const replaceUnnormalizedLabelsFeature = (
+    <ConfigInfoFeature
+      label="Replace Unnormalized Labels"
+      key="ENSIndexer Replace Unnormalized Labels feature"
+      description={replaceUnnormalizedLabelsDescription}
+      icon={<Replace width={15} height={15} stroke="#3F3F46" className="flex-shrink-0" />}
+    />
+  );
+
+  const subgraphCompatabilityFeature = (
+    <ConfigInfoFeature
+      label="Subgraph Compatibility"
+      key="ENSIndexer Subgraph Compatibility feature"
+      description={subgraphCompatibilityDescription}
+      icon={<IconGraphNetwork width={15} height={15} className="text-[#3F3F46] flex-shrink-0" />}
+    />
+  );
+
+  const ensIndexerFeatures = [
+    {
+      isActivated: healReverseAddressesActivated,
+      feature: healReverseAddressesFeature,
+    },
+    {
+      isActivated: indexAdditionalRecordsActivated,
+      feature: indexAdditionalRecordsFeature,
+    },
+    {
+      isActivated: replaceUnnormalizedLabelsActivated,
+      feature: replaceUnnormalizedLabelsFeature,
+    },
+    {
+      isActivated: subgraphCompatibilityActivated,
+      feature: subgraphCompatabilityFeature,
+    },
+  ];
+
   const ensRootChainId = getENSRootChainId(ensIndexerPublicConfig.namespace);
 
   return (
@@ -285,7 +340,7 @@ function ENSNodeConfigCardContent({
             }
           />
         </ConfigInfoItems>
-        <ConfigInfoFeatures>
+        <ConfigInfoFeatures activated={ensApiPublicConfig.theGraphFallback.canFallback}>
           <ConfigInfoFeature
             label="Subgraph API Fallback"
             description={
@@ -312,7 +367,6 @@ function ENSNodeConfigCardContent({
                 </p>
               )
             }
-            isActivated={ensApiPublicConfig.theGraphFallback.canFallback}
             icon={<History width={15} height={15} className="flex-shrink-0" />}
           />
         </ConfigInfoFeatures>
@@ -471,33 +525,15 @@ function ENSNodeConfigCardContent({
             }
           />
         </ConfigInfoItems>
-        <ConfigInfoFeatures>
-          <ConfigInfoFeature
-            label="Heal Reverse Addresses"
-            description={healReverseAddressesDescription}
-            isActivated={healReverseAddressesActivated}
-            icon={<HealIcon width={15} height={15} className="flex-shrink-0" />}
-          />
-          <ConfigInfoFeature
-            label="Index Additional Resolver Records"
-            description={indexAdditionalRecordsDescription}
-            isActivated={indexAdditionalRecordsActivated}
-            icon={<IndexAdditionalRecordsIcon width={15} height={15} className="flex-shrink-0" />}
-          />
-          <ConfigInfoFeature
-            label="Replace Unnormalized Labels"
-            description={replaceUnnormalizedLabelsDescription}
-            isActivated={replaceUnnormalizedLabelsActivated}
-            icon={<Replace width={15} height={15} stroke="#3F3F46" className="flex-shrink-0" />}
-          />
-          <ConfigInfoFeature
-            label="Subgraph Compatibility"
-            description={subgraphCompatibilityDescription}
-            isActivated={subgraphCompatibilityActivated}
-            icon={
-              <IconGraphNetwork width={15} height={15} className="text-[#3F3F46] flex-shrink-0" />
-            }
-          />
+        <ConfigInfoFeatures activated={true}>
+          {ensIndexerFeatures
+            .filter((feature) => feature.isActivated)
+            .map((feature) => feature.feature)}
+        </ConfigInfoFeatures>
+        <ConfigInfoFeatures activated={false}>
+          {ensIndexerFeatures
+            .filter((feature) => !feature.isActivated)
+            .map((feature) => feature.feature)}
         </ConfigInfoFeatures>
         <ConfigInfoItems>
           <ConfigInfoItem