diff --git a/src/renderer/api/jellyfin/jellyfin-controller.ts b/src/renderer/api/jellyfin/jellyfin-controller.ts
index 01d5113a0..cc43cbe20 100644
--- a/src/renderer/api/jellyfin/jellyfin-controller.ts
+++ b/src/renderer/api/jellyfin/jellyfin-controller.ts
@@ -366,7 +366,7 @@ export const JellyfinController: InternalControllerEndpoint = {
                 GenreIds: query.genreIds ? query.genreIds.join(',') : undefined,
                 IncludeItemTypes: 'MusicAlbum',
                 IsFavorite: query.favorite,
-                Limit: query.limit,
+                Limit: query.limit === -1 ? undefined : query.limit,
                 ParentId: getLibraryId(query.musicFolderId),
                 Recursive: true,
                 SearchTerm: query.searchTerm,
diff --git a/src/renderer/components/item-image/item-image.tsx b/src/renderer/components/item-image/item-image.tsx
index 810fe1fd3..aff3f4596 100644
--- a/src/renderer/components/item-image/item-image.tsx
+++ b/src/renderer/components/item-image/item-image.tsx
@@ -41,13 +41,13 @@ const BaseItemImage = (
         type?: keyof z.infer<typeof GeneralSettingsSchema>['imageRes'];
     },
 ) => {
-    const { src, ...rest } = props;
+    const { serverId, src, ...rest } = props;
 
     const imageUrl = useItemImageUrl({
         id: props.id,
         imageUrl: src,
         itemType: props.itemType,
-        serverId: props.serverId || undefined,
+        serverId: serverId || undefined,
         type: props.type,
     });