diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/playback/AudioNowPlayingFragment.java b/app/src/main/java/org/jellyfin/androidtv/ui/playback/AudioNowPlayingFragment.java
index 0063bee98d..4306ff88c1 100644
--- a/app/src/main/java/org/jellyfin/androidtv/ui/playback/AudioNowPlayingFragment.java
+++ b/app/src/main/java/org/jellyfin/androidtv/ui/playback/AudioNowPlayingFragment.java
@@ -256,14 +256,9 @@ public void onProgress(long pos) {
         @Override
         public void onQueueStatusChanged(boolean hasQueue) {
             Timber.d("Queue status changed (hasQueue=%s)", hasQueue);
-            if (hasQueue) {
-                loadItem();
-                if (mediaManager.getValue().isAudioPlayerInitialized()) {
-                    updateButtons();
-                }
-            } else {
-                if (navigationRepository.getValue().getCanGoBack()) navigationRepository.getValue().goBack();
-                else navigationRepository.getValue().reset(Destinations.INSTANCE.getHome());
+            loadItem();
+            if (mediaManager.getValue().isAudioPlayerInitialized()) {
+                updateButtons();
             }
         }
 
@@ -308,6 +303,9 @@ private void loadItem() {
         if (mBaseItem != null) {
             updatePoster();
             updateInfo(mBaseItem);
+        } else {
+            if (navigationRepository.getValue().getCanGoBack()) navigationRepository.getValue().goBack();
+            else navigationRepository.getValue().navigate(Destinations.INSTANCE.getHome());
         }
     }