diff --git a/src/core/collection/musicbrainz.rs b/src/core/collection/musicbrainz.rs
index 19597b6..d89ee94 100644
--- a/src/core/collection/musicbrainz.rs
+++ b/src/core/collection/musicbrainz.rs
@@ -48,8 +48,15 @@ pub enum MbRefOption<T> {
 impl<T> MbRefOption<T> {
     pub fn or(self, optb: MbRefOption<T>) -> MbRefOption<T> {
         match self {
-            x @ MbRefOption::Some(_) => x,
-            MbRefOption::CannotHaveMbid | MbRefOption::None => optb,
+            opta @ MbRefOption::Some(_) => opta,
+            opta @ MbRefOption::CannotHaveMbid => {
+                if matches!(optb, MbRefOption::Some(_)) {
+                    optb
+                } else {
+                    opta
+                }
+            }
+            MbRefOption::None => optb,
         }
     }