diff --git a/src/components/quicklaunch.jsx b/src/components/quicklaunch.jsx
index a356fdee..7fb1460a 100644
--- a/src/components/quicklaunch.jsx
+++ b/src/components/quicklaunch.jsx
@@ -199,7 +199,7 @@ export default function QuickLaunch({
             {results.length > 0 && (
               <ul className="max-h-[60vh] overflow-y-auto m-2">
                 {results.map((r, i) => (
-                  <li key={r.container ?? r.app ?? `${r.name}-${r.href}`}>
+                  <li key={[r.name, r.container, r.app, r.href].filter((s) => s).join("-")}>
                     <button
                       type="button"
                       data-index={i}
diff --git a/src/components/services/list.jsx b/src/components/services/list.jsx
index 85436178..f3fd6e2a 100644
--- a/src/components/services/list.jsx
+++ b/src/components/services/list.jsx
@@ -14,7 +14,7 @@ export default function List({ group, services, layout, useEqualHeights }) {
     >
       {services.map((service) => (
         <Item
-          key={service.container ?? service.app ?? service.name}
+          key={[service.container, service.app, service.name].filter((s) => s).join("-")}
           service={service}
           group={group}
           useEqualHeights={layout?.useEqualHeights ?? useEqualHeights}