diff --git a/src/libs/Avatars/PresetAvatarCatalog.ts b/src/libs/Avatars/PresetAvatarCatalog.ts
index d512657bd2ef..95ad94d22a8b 100644
--- a/src/libs/Avatars/PresetAvatarCatalog.ts
+++ b/src/libs/Avatars/PresetAvatarCatalog.ts
@@ -216,8 +216,8 @@ function getLetterAvatar(name?: string): React.FC<SvgProps> | null {
 
 const PRESET_AVATAR_CATALOG_ORDERED = buildOrderedAvatars();
 
-const getAvatarLocal = (id: PresetAvatarID) => PRESET_AVATAR_CATALOG[id].local;
-const getAvatarURL = (id: PresetAvatarID) => PRESET_AVATAR_CATALOG[id].url;
+const getAvatarLocal = (id: PresetAvatarID) => PRESET_AVATAR_CATALOG[id]?.local;
+const getAvatarURL = (id: PresetAvatarID) => PRESET_AVATAR_CATALOG[id]?.url;
 
 /**
  * Type guard to check if a value is a valid PresetAvatarID
diff --git a/tests/unit/libs/Avatars/PresetAvatarCatalogTest.tsx b/tests/unit/libs/Avatars/PresetAvatarCatalogTest.tsx
index 51e97017180f..2a2f5a88fe67 100644
--- a/tests/unit/libs/Avatars/PresetAvatarCatalogTest.tsx
+++ b/tests/unit/libs/Avatars/PresetAvatarCatalogTest.tsx
@@ -49,7 +49,9 @@ describe('PresetAvatarCatalog', () => {
 
     it('throws or returns undefined for an unknown ID', () => {
         // @ts-expect-error - This is a test for an unknown ID
-        expect(() => getAvatarLocal('not-a-real-id')).toThrow();
+        expect(getAvatarLocal('not-a-real-id')).toBeUndefined();
+        // @ts-expect-error - This is a test for an unknown ID
+        expect(getAvatarURL('not-a-real-id')).toBeUndefined();
     });
 
     it('ALL contains both default and seasonal IDs', () => {