diff --git a/unshackle/core/titles/episode.py b/unshackle/core/titles/episode.py
index 6592b60..b260ce9 100644
--- a/unshackle/core/titles/episode.py
+++ b/unshackle/core/titles/episode.py
@@ -185,7 +185,10 @@ class Episode(Title):
                 if hdr_format:
                     if hdr_format_full.startswith("Dolby Vision"):
                         name += " DV"
-                        if any(indicator in hdr_format_full for indicator in ["HDR10", "SMPTE ST 2086"]):
+                        if any(
+                            indicator in (hdr_format_full + " " + hdr_format)
+                            for indicator in ["HDR10", "SMPTE ST 2086"]
+                        ):
                             name += " HDR"
                     else:
                         name += f" {DYNAMIC_RANGE_MAP.get(hdr_format)} "
diff --git a/unshackle/core/titles/movie.py b/unshackle/core/titles/movie.py
index 1545b18..bda68df 100644
--- a/unshackle/core/titles/movie.py
+++ b/unshackle/core/titles/movie.py
@@ -136,7 +136,10 @@ class Movie(Title):
                 if hdr_format:
                     if hdr_format_full.startswith("Dolby Vision"):
                         name += " DV"
-                        if any(indicator in hdr_format_full for indicator in ["HDR10", "SMPTE ST 2086"]):
+                        if any(
+                            indicator in (hdr_format_full + " " + hdr_format)
+                            for indicator in ["HDR10", "SMPTE ST 2086"]
+                        ):
                             name += " HDR"
                     else:
                         name += f" {DYNAMIC_RANGE_MAP.get(hdr_format)} "