diff --git a/src/renderer/features/albums/components/album-detail-content.tsx b/src/renderer/features/albums/components/album-detail-content.tsx
index 20bf05423..c75ef6866 100644
--- a/src/renderer/features/albums/components/album-detail-content.tsx
+++ b/src/renderer/features/albums/components/album-detail-content.tsx
@@ -639,7 +639,7 @@ const AlbumDetailSongsTable = ({ songs }: AlbumDetailSongsTableProps) => {
 
     const groups = useMemo(() => {
         // Remove groups when filtering
-        if (debouncedSearchTerm.trim()) {
+        if (debouncedSearchTerm?.trim()) {
             return undefined;
         }
 
diff --git a/src/renderer/features/artists/components/album-artist-detail-content.tsx b/src/renderer/features/artists/components/album-artist-detail-content.tsx
index f9c5bc465..68359de0b 100644
--- a/src/renderer/features/artists/components/album-artist-detail-content.tsx
+++ b/src/renderer/features/artists/components/album-artist-detail-content.tsx
@@ -262,7 +262,7 @@ const AlbumArtistMetadataTopSongsContent = ({
     const filteredSongs = useMemo(() => {
         const filtered = searchLibraryItems(songs, debouncedSearchTerm, LibraryItem.SONG);
         // When searching, show all results. Otherwise, limit to 5 if not showing all
-        if (debouncedSearchTerm.trim() || showAll) {
+        if (debouncedSearchTerm?.trim() || showAll) {
             return filtered;
         }
         return filtered.slice(0, 5);
diff --git a/src/renderer/features/shared/utils.ts b/src/renderer/features/shared/utils.ts
index c0ebedad3..b82558eea 100644
--- a/src/renderer/features/shared/utils.ts
+++ b/src/renderer/features/shared/utils.ts
@@ -227,11 +227,11 @@ export const createFuseForLibraryItem = <T extends FuseSearchableItem>(
 
 export const searchLibraryItems = <T extends FuseSearchableItem>(
     items: T[],
-    searchTerm: string,
+    searchTerm: string | undefined,
     itemType: LibraryItem,
     options?: CreateFuseOptions,
 ): T[] => {
-    if (!searchTerm.trim()) {
+    if (!searchTerm?.trim()) {
         return items;
     }