diff --git a/libs/ui/src/lib/account-selector/account-selector.component.ts b/libs/ui/src/lib/account-selector/account-selector.component.ts
index bb4ef646e..06c179108 100644
--- a/libs/ui/src/lib/account-selector/account-selector.component.ts
+++ b/libs/ui/src/lib/account-selector/account-selector.component.ts
@@ -63,7 +63,9 @@ export class GfAccountSelectorComponent
 
   public readonly sortedAccounts = computed(() => {
     return [...this.accounts()].sort((a, b) => {
-      return a.name.toLowerCase().localeCompare(b.name.toLowerCase());
+      return (a.name ?? '')
+        .toLowerCase()
+        .localeCompare((b.name ?? '').toLowerCase());
     });
   });