diff --git a/mpd/song.cpp b/mpd/song.cpp
index edd6c3836..94738bf6f 100644
--- a/mpd/song.cpp
+++ b/mpd/song.cpp
@@ -216,11 +216,7 @@ int Song::compareTo(const Song &o) const
         if (0!=compare) {
             return compare;
         }
-        compare=album.localeAwareCompare(o.album);
-        if (0!=compare) {
-            return compare;
-        }
-        mbAlbumId.compare(o.mbAlbumId);
+        compare=mbAlbumId.isEmpty() ? album.localeAwareCompare(o.album) : mbAlbumId.compare(o.mbAlbumId);
         if (0!=compare) {
             return compare;
         }