diff --git a/jellyfin_kodi/helper/playutils.py b/jellyfin_kodi/helper/playutils.py
index b17acb26..1c8a3c2d 100644
--- a/jellyfin_kodi/helper/playutils.py
+++ b/jellyfin_kodi/helper/playutils.py
@@ -385,13 +385,10 @@ class PlayUtils(object):
     def get_transcoding_video_codec(self):
         codecs = ["h264", "mpeg4", "mpeg2video", "vc1"]
 
-        if not settings("transcode_h265.bool"):
-            codecs.insert(1, "hevc")  # Add HEVC if transcoding is not forced
-
         if settings("videoPreferredCodec") == "H265/HEVC":
-            if "hevc" in codecs:
-                codecs.remove("hevc")
-            codecs.insert(0, "hevc")  # Add HEVC at the beginning if preferred
+            codecs.insert(0, "hevc")
+        elif not settings("transcode_h265.bool"):
+            codecs.insert(1, "hevc")
 
         if settings("transcode_mpeg2.bool"):
             codecs.remove("mpeg2video")
diff --git a/tests/test_playutils_settings.py b/tests/test_playutils_settings.py
index 9cdcfa5d..22ab678e 100644
--- a/tests/test_playutils_settings.py
+++ b/tests/test_playutils_settings.py
@@ -34,6 +34,7 @@ class PatchedSettings:
             setting = setting.replace(".bool", "")
             value = bool(value)
         cls.settings[setting] = value
+        return None
 
     @classmethod
     def clear(cls):