diff --git a/Limelight/Database/TemporarySettings.m b/Limelight/Database/TemporarySettings.m
index 2b0b803d..e86446c6 100644
--- a/Limelight/Database/TemporarySettings.m
+++ b/Limelight/Database/TemporarySettings.m
@@ -36,7 +36,7 @@
     assert([self.framerate intValue] != 0);
     self.audioConfig = [NSNumber numberWithInteger:[[NSUserDefaults standardUserDefaults] integerForKey:@"audioConfig"]];
     assert([self.audioConfig intValue] != 0);
-    self.useHevc = [[NSUserDefaults standardUserDefaults] boolForKey:@"useHevc"];
+    self.useHevc = [[NSUserDefaults standardUserDefaults] boolForKey:@"useHevc2"];
     self.useFramePacing = [[NSUserDefaults standardUserDefaults] integerForKey:@"useFramePacing"] != 0;
     self.playAudioOnPC = [[NSUserDefaults standardUserDefaults] boolForKey:@"audioOnPC"];
     self.enableHdr = [[NSUserDefaults standardUserDefaults] boolForKey:@"enableHdr"];
diff --git a/Limelight/Stream/Connection.m b/Limelight/Stream/Connection.m
index 664b7ad7..572188f9 100644
--- a/Limelight/Stream/Connection.m
+++ b/Limelight/Stream/Connection.m
@@ -414,9 +414,7 @@ void ClSetHdrMode(bool enabled)
     // As a result, we will only use HEVC on iOS 11.3 or later.
     if (@available(iOS 11.3, tvOS 11.3, *)) {
         _streamConfig.supportsHevc =
-#if !TARGET_OS_TV
             config.allowHevc &&
-#endif
             VTIsHardwareDecodeSupported(kCMVideoCodecType_HEVC);
     }
     
diff --git a/Moonlight TV/Settings.bundle/Root.plist b/Moonlight TV/Settings.bundle/Root.plist
index 975f11bf..fb7ef399 100644
--- a/Moonlight TV/Settings.bundle/Root.plist	
+++ b/Moonlight TV/Settings.bundle/Root.plist	
@@ -186,7 +186,7 @@
 			<key>Title</key>
 			<string>Use HEVC Codec</string>
 			<key>Key</key>
-			<string>useHevc</string>
+			<string>useHevc2</string>
 			<key>DefaultValue</key>
 			<true/>
 		</dict>