diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
index 59659754..390a0a47 100644
--- a/resources/language/English/strings.xml
+++ b/resources/language/English/strings.xml
@@ -409,6 +409,7 @@
     <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>
 
     <!-- Plex Entrypoint.py -->
     <string id="39200">Log-out Plex Home User </string>
diff --git a/resources/language/German/strings.xml b/resources/language/German/strings.xml
index d5f45fff..16499a00 100644
--- a/resources/language/German/strings.xml
+++ b/resources/language/German/strings.xml
@@ -348,6 +348,7 @@
     <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>
 
     <!-- Plex Entrypoint.py -->
     <string id="39200">Plex Home Benutzer abmelden: </string>
diff --git a/resources/lib/playutils.py b/resources/lib/playutils.py
index db59a5a4..a2585f56 100644
--- a/resources/lib/playutils.py
+++ b/resources/lib/playutils.py
@@ -166,6 +166,7 @@ class PlayUtils():
         Returns True if we need to transcode because
             - codec is in h265
             - 10bit video codec
+            - HEVC codec
         if the corresponding file settings are set to 'true'
         """
         videoCodec = self.API.getVideoCodec()
@@ -189,6 +190,10 @@ class PlayUtils():
                 videoCodec['bitDepth'] == '10'):
             self.logMsg('Option to transcode 10bit video content enabled.', 1)
             return True
+        if (utils.settings('transcodeHEVC') == 'true' and
+                codec == 'hevc'):
+            self.logMsg('Option to transcode HEVC video content enabled.', 1)
+            return True
 
         return False
 
diff --git a/resources/settings.xml b/resources/settings.xml
index ea3866bb..4de1aa92 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -99,6 +99,7 @@
 	    <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="11" />
 	    <setting id="transcodeH265" type="enum" label="30522" default="0" values="Disabled (default)|480p (and higher)|720p (and higher)|1080p" />
 	    <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="markPlayed" type="number" visible="false" default="95" />