diff --git a/src/components/services/group.jsx b/src/components/services/group.jsx
index d53173e8..641625a3 100644
--- a/src/components/services/group.jsx
+++ b/src/components/services/group.jsx
@@ -9,8 +9,6 @@ import ResolvedIcon from "components/resolvedicon";
 
 export default function ServicesGroup({
   group,
-  services,
-  groups,
   layout,
   fiveColumns,
   disableCollapse,
@@ -25,7 +23,7 @@ export default function ServicesGroup({
 
   return (
     <div
-      key={services.name}
+      key={group.name}
       className={classNames(
         "services-group",
         layout?.style === "row" ? "basis-full" : "basis-full md:basis-1/2 lg:basis-1/3 xl:basis-1/4",
@@ -44,7 +42,7 @@ export default function ServicesGroup({
                   </div>
                 )}
                 <h2 className="flex text-theme-800 dark:text-theme-300 text-xl font-medium service-group-name">
-                  {services.name}
+                  {group.name}
                 </h2>
                 <MdKeyboardArrowDown
                   className={classNames(
@@ -76,17 +74,17 @@ export default function ServicesGroup({
               }}
             >
               <Disclosure.Panel className="transition-all overflow-hidden duration-300 ease-out" ref={panel} static>
-                {groups?.length ? (
+                <List group={group} services={group.services} layout={layout} useEqualHeights={useEqualHeights} />
+                {group.groups?.length > 0 && (
                   <div
                     className={`grid ${
                       layout?.style === "row" ? `grid ${columnMap[layout?.columns]} gap-x-2` : "flex flex-col"
                     } gap-2`}
                   >
-                    {groups.map((subgroup) => (
+                    {group.groups.map((subgroup) => (
                       <ServicesGroup
                         key={subgroup.name}
-                        group={subgroup.name}
-                        services={subgroup}
+                        group={subgroup}
                         layout={layout?.[subgroup.name]}
                         fiveColumns={fiveColumns}
                         disableCollapse={disableCollapse}
@@ -95,8 +93,6 @@ export default function ServicesGroup({
                       />
                     ))}
                   </div>
-                ) : (
-                  <List group={group} services={services.services} layout={layout} useEqualHeights={useEqualHeights} />
                 )}
               </Disclosure.Panel>
             </Transition>
diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index cf95da07..7a7fdef0 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -291,9 +291,7 @@ function Home({ initialSettings }) {
               group.services ? (
                 <ServicesGroup
                   key={group.name}
-                  group={group.name}
-                  services={group}
-                  groups={group.groups}
+                  group={group}
                   layout={settings.layout?.[group.name]}
                   fiveColumns={settings.fiveColumns}
                   disableCollapse={settings.disableCollapse}
@@ -317,9 +315,7 @@ function Home({ initialSettings }) {
             {serviceGroups.map((group) => (
               <ServicesGroup
                 key={group.name}
-                group={group.name}
-                services={group}
-                groups={group.groups}
+                group={group}
                 layout={settings.layout?.[group.name]}
                 fiveColumns={settings.fiveColumns}
                 disableCollapse={settings.disableCollapse}