diff --git a/src/screens/Music/overlays/NowPlaying/index.tsx b/src/screens/Music/overlays/NowPlaying/index.tsx
index bd895a93..19b65ff3 100644
--- a/src/screens/Music/overlays/NowPlaying/index.tsx
+++ b/src/screens/Music/overlays/NowPlaying/index.tsx
@@ -159,9 +159,11 @@ function NowPlaying() {
                     </ShadowWrapper>
                     <TrackNameContainer>
                         <Text numberOfLines={1}>{track.title}</Text>
-                        <Text style={{ opacity: 0.5 }} numberOfLines={1}>
-                            {track.artist}{track.album ? ` — ${track.album}` : ''}
-                        </Text>
+                        {(track.artist || track.album) && (
+                            <Text style={{ opacity: 0.5 }} numberOfLines={1}>
+                                {track.artist}{track.album ? ` — ${track.album}` : ''}
+                            </Text>
+                        )}
                     </TrackNameContainer>
                     <ActionButton>
                         <SelectActionButton />
diff --git a/src/screens/Search/index.tsx b/src/screens/Search/index.tsx
index 99e6b742..ddfa96d1 100644
--- a/src/screens/Search/index.tsx
+++ b/src/screens/Search/index.tsx
@@ -295,12 +295,14 @@ export default function Search() {
                                     <Text numberOfLines={1}>
                                         {trackName || album.Name}
                                     </Text>
-                                    <HalfOpacity style={defaultStyles.text} numberOfLines={1}>
-                                        {type === 'AlbumArtist' 
-                                            ? `${t('album')} • ${album.AlbumArtist}`
-                                            : `${t('track')} • ${album.AlbumArtist} — ${album.Name}`
-                                        }
-                                    </HalfOpacity>
+                                    {(album.AlbumArtist || album.Name) && (
+                                        <HalfOpacity style={defaultStyles.text} numberOfLines={1}>
+                                            {type === 'AlbumArtist' 
+                                                ? `${t('album')} • ${album.AlbumArtist}`
+                                                : `${t('track')} • ${album.AlbumArtist} — ${album.Name}`
+                                            }
+                                        </HalfOpacity>
+                                    )}
                                 </View>
                                 <View style={{ marginLeft: 16 }}>
                                     <DownloadIcon trackId={id} />
diff --git a/src/screens/modals/Player/components/Queue.tsx b/src/screens/modals/Player/components/Queue.tsx
index 4ac9dde9..f450b212 100644
--- a/src/screens/modals/Player/components/Queue.tsx
+++ b/src/screens/modals/Player/components/Queue.tsx
@@ -142,12 +142,14 @@ export default function Queue({ header }: Props) {
                             >
                                 {track.title}
                             </Text>
-                            <TextHalfOpacity
-                                style={currentIndex === index ? { color: THEME_COLOR, fontWeight: '400' } : undefined}
-                                numberOfLines={1}
-                            >
-                                {track.artist}{track.album && ' — ' + track.album}
-                            </TextHalfOpacity>
+                            {(track.artist || track.album) && (
+                                <TextHalfOpacity
+                                    style={currentIndex === index ? { color: THEME_COLOR, fontWeight: '400' } : undefined}
+                                    numberOfLines={1}
+                                >
+                                    {track.artist}{track.album && ' — ' + track.album}
+                                </TextHalfOpacity>
+                            )}
                         </View>
                         <View style={{ marginLeft: 'auto', marginRight: 8 }}>
                             <TextHalfOpacity