diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
index 4a9ae773..4cf19292 100644
--- a/resources/language/English/strings.xml
+++ b/resources/language/English/strings.xml
@@ -296,7 +296,7 @@
     <string id="30519">Ask to play trailers</string>
     <string id="30520">Skip Plex delete confirmation for the context menu (use at your own risk)</string>
     <string id="30521">Jump back on resume (in seconds)</string>
-    <string id="30522">Force transcode H265</string>
+    <string id="30522">Force transcode h265/HEVC</string>
     <string id="30523">Music metadata options (not compatible with direct stream)</string>
     <string id="30524">Import music song rating directly from files</string>
     <string id="30525">Convert music song rating to Emby rating</string>
@@ -425,7 +425,6 @@
     <string id="39062">Sync when screensaver is deactivated</string>
     <string id="39063">Force Transcode Hi10P</string>
     <string id="39064">Recently Added: Also show already watched episodes</string>
-    <string id="39065">Force Transcode HEVC</string>
     <string id="39066">Recently Added: Also show already watched movies (Refresh Plex playlist/nodes!)</string>
     <string id="39067">Your current Plex Media Server:</string>
     <string id="39068">[COLOR yellow]Manually enter Plex Media Server address[/COLOR]</string>
diff --git a/resources/language/German/strings.xml b/resources/language/German/strings.xml
index 1ec86c3f..bdd2f012 100644
--- a/resources/language/German/strings.xml
+++ b/resources/language/German/strings.xml
@@ -18,7 +18,7 @@
     <string id="30509">Plex Musik-Bibliotheken aktivieren</string>
     <string id="30518">Plex Trailer aktivieren (Plexpass benötigt)</string>
     <string id="30519">Nachfragen, ob Trailer gespielt werden sollen</string>
-    <string id="30522">H265 Codec Transkodierung erzwingen</string>
+    <string id="30522">h265/HEVC Codec Transkodierung erzwingen</string>
     <string id="30517">Netzwerk Credentials eingeben</string>
     <string id="30529">PlexKodiConnect Start Verzögerung (in Sekunden)</string>
     <string id="30527">Extras ignorieren, wenn Nächste Episode gespielt wird</string>
@@ -374,7 +374,6 @@
     <string id="39062">Sync wenn Bildschirmschoner deaktiviert wird</string>
     <string id="39063">Hi10p Codec Transkodierung erzwingen</string>
     <string id="39064">"Zuletzt hinzugefügt": gesehene Folgen anzeigen</string>
-    <string id="39065">HEVC Codec Transkodierung erzwingen</string>
     <string id="39066">"Zuletzt hinzugefügt": gesehene Filme anzeigen (Plex Playlisten und Nodes zurücksetzen!)</string>
     <string id="39067">Aktueller Plex Media Server:</string>
     <string id="39068">[COLOR yellow]Plex Media Server Adresse manuell eingeben[/COLOR]</string>
diff --git a/resources/lib/playutils.py b/resources/lib/playutils.py
index f625c967..254c33a1 100644
--- a/resources/lib/playutils.py
+++ b/resources/lib/playutils.py
@@ -173,9 +173,6 @@ class PlayUtils():
             log.info('Option to transcode 10bit video content enabled.')
             return True
         codec = videoCodec['videocodec']
-        if (settings('transcodeHEVC') == 'true' and codec == 'hevc'):
-            log.info('Option to transcode HEVC video codec enabled.')
-            return True
         if codec is None:
             # e.g. trailers. Avoids TypeError with "'h265' in codec"
             log.info('No codec from PMS, not transcoding.')
@@ -195,10 +192,10 @@ class PlayUtils():
         except (TypeError, ValueError):
             log.info('No video resolution from PMS, not transcoding.')
             return False
-        if 'h265' in codec:
+        if 'h265' in codec or 'hevc' in codec:
             if resolution >= self.getH265():
-                log.info("Option to transcode h265 enabled. Resolution of "
-                         "the media: %s, transcoding limit resolution: %s"
+                log.info("Option to transcode h265/HEVC enabled. Resolution "
+                         "of the media: %s, transcoding limit resolution: %s"
                          % (str(resolution), str(self.getH265())))
                 return True
         return False
diff --git a/resources/settings.xml b/resources/settings.xml
index 42a8d5d5..5f1d2456 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -100,9 +100,8 @@
 	    <setting id="playType" type="enum" label="30002" values="Direct Play (default)|Direct Stream|Force Transcode" default="0" />
 	    <setting id="transcoderVideoQualities" type="enum" label="30160" values="420x420, 320kbps|576x320, 720kbps|720x480, 1.5Mbps|1024x768, 2Mbps|1280x720, 3Mbps|1280x720, 4Mbps|1920x1080, 8Mbps|1920x1080, 10Mbps|1920x1080, 12Mbps|1920x1080, 20Mbps|1920x1080, 40Mbps" default="10" /><!-- Video Quality if Transcoding necessary -->
 	    <setting id="maxVideoQualities" type="enum" label="30143" values="320kbps|720kbps|1.5Mbps|2Mbps|3Mbps|4Mbps|8Mbps|10Mbps|12Mbps|20Mbps|40Mbps|deactivated" default="11" /><!-- Always transcode if video bitrate is above -->
-	    <setting id="transcodeH265" type="enum" label="30522" default="0" values="Disabled (default)|480p (and higher)|720p (and higher)|1080p" />
+	    <setting id="transcodeH265" type="enum" label="30522" default="0" values="Disabled (default)|480p (and higher)|720p (and higher)|1080p" /><!-- Force transcode h265/HEVC -->
 	    <setting id="transcodeHi10P" type="bool" label="39063" default="false"/>
-	    <setting id="transcodeHEVC" type="bool" label="39065" default="false"/>
 	    <setting id="audioBoost" type="slider" label="39001" default="0" range="0,10,100" option="int"/>
 	    <setting id="subtitleSize" label="39002" type="slider" option="int" range="0,30,300" default="100" />
 	    <setting id="failedCount" type="number" visible="false" default="0" />