diff --git a/unshackle/core/manifests/dash.py b/unshackle/core/manifests/dash.py
index 438351b..fd51557 100644
--- a/unshackle/core/manifests/dash.py
+++ b/unshackle/core/manifests/dash.py
@@ -468,7 +468,8 @@ class DASH:
         track.data["dash"]["segment_durations"] = segment_durations
 
         if init_data and isinstance(track, (Video, Audio)):
-            if isinstance(cdm, PlayReadyCdm):
+            prefers_playready = isinstance(cdm, PlayReadyCdm) or (hasattr(cdm, "is_playready") and cdm.is_playready)
+            if prefers_playready:
                 try:
                     track.drm = [PlayReady.from_init_data(init_data)]
                 except PlayReady.Exceptions.PSSHNotFound:
diff --git a/unshackle/core/manifests/hls.py b/unshackle/core/manifests/hls.py
index 85ec245..2f3dd1f 100644
--- a/unshackle/core/manifests/hls.py
+++ b/unshackle/core/manifests/hls.py
@@ -591,7 +591,11 @@ class HLS:
 
                 segment_keys = getattr(segment, "keys", None)
                 if segment_keys:
-                    key = HLS.get_supported_key(segment_keys)
+                    if cdm:
+                        cdm_segment_keys = HLS.filter_keys_for_cdm(segment_keys, cdm)
+                        key = HLS.get_supported_key(cdm_segment_keys) if cdm_segment_keys else HLS.get_supported_key(segment_keys)
+                    else:
+                        key = HLS.get_supported_key(segment_keys)
                     if encryption_data and encryption_data[0] != key and i != 0 and segment not in unwanted_segments:
                         decrypt(include_this_segment=False)