diff --git a/src/renderer/api/subsonic/subsonic-controller.ts b/src/renderer/api/subsonic/subsonic-controller.ts
index 77833299f..561eed50e 100644
--- a/src/renderer/api/subsonic/subsonic-controller.ts
+++ b/src/renderer/api/subsonic/subsonic-controller.ts
@@ -619,7 +619,7 @@ export const SubsonicController: InternalControllerEndpoint = {
         );
     },
     getGenreList: async ({ apiClientProps, query }) => {
-        const sortOrder = query.sortOrder.toLowerCase() as 'asc' | 'desc';
+        const sortOrder = (query.sortOrder?.toLowerCase() ?? 'asc') as 'asc' | 'desc';
 
         const res = await ssApiClient(apiClientProps).getGenres({});
 
diff --git a/src/shared/api/jellyfin/jellyfin-normalize.ts b/src/shared/api/jellyfin/jellyfin-normalize.ts
index 2fe6a30a7..9aea04b54 100644
--- a/src/shared/api/jellyfin/jellyfin-normalize.ts
+++ b/src/shared/api/jellyfin/jellyfin-normalize.ts
@@ -295,16 +295,17 @@ const normalizeAlbum = (
         createdAt: item.DateCreated,
         duration: item.RunTimeTicks / 10000,
         explicitStatus: null,
-        genres: item.GenreItems?.map((entry) => ({
-            _itemType: LibraryItem.GENRE,
-            _serverId: server?.id || '',
-            _serverType: ServerType.JELLYFIN,
-            albumCount: null,
-            id: entry.Id,
-            imageUrl: null,
-            name: entry.Name,
-            songCount: null,
-        })),
+        genres:
+            item.GenreItems?.map((entry) => ({
+                _itemType: LibraryItem.GENRE,
+                _serverId: server?.id || '',
+                _serverType: ServerType.JELLYFIN,
+                albumCount: null,
+                id: entry.Id,
+                imageUrl: null,
+                name: entry.Name,
+                songCount: null,
+            })) || [],
         id: item.Id,
         imagePlaceholderUrl: null,
         imageUrl: getAlbumCoverArtUrl({