diff --git a/server/src/import/search_result.rs b/server/src/import/search_result.rs
index c2398ca..8978e50 100644
--- a/server/src/import/search_result.rs
+++ b/server/src/import/search_result.rs
@@ -221,7 +221,10 @@ impl From<musicbrainz::Release> for SearchResult {
             release: entity::Release {
                 id: release.id,
                 title: release.title,
-                disambiguation: release.disambiguation,
+                disambiguation: match release.disambiguation {
+                    Some(d) if !d.is_empty() => Some(d),
+                    _ => None,
+                },
                 release_group_id: release.release_group.as_ref().map(|r| r.id),
                 release_type: release
                     .release_group
diff --git a/tag/src/map.rs b/tag/src/map.rs
index 41993b9..68be5a9 100644
--- a/tag/src/map.rs
+++ b/tag/src/map.rs
@@ -157,7 +157,6 @@ pub fn tags_from_full_release(full_release: &FullRelease) -> Result<TagMap> {
         map.insert(TagKey::Media, vec![media_format.to_string()]);
     }
     let title = if let Some(ref disambiguation) = release.disambiguation {
-        // TODO: Make the disambiguation format configurable
         strfmt(
             &settings.library.tagging.title_format,
             &HashMap::from([