diff --git a/app/src/main/java/com/limelight/binding/video/MediaCodecHelper.java b/app/src/main/java/com/limelight/binding/video/MediaCodecHelper.java
index 8f30973e..f2a81f1d 100644
--- a/app/src/main/java/com/limelight/binding/video/MediaCodecHelper.java
+++ b/app/src/main/java/com/limelight/binding/video/MediaCodecHelper.java
@@ -79,7 +79,7 @@ public class MediaCodecHelper {
 
 		whitelistedHevcDecoders = new LinkedList<>();
 		whitelistedHevcDecoders.add("omx.exynos");
-		whitelistedHevcDecoders.add("omx.nvidia");
+		// whitelistedHevcDecoders.add("omx.nvidia"); TODO: This needs a similar fixup to the Tegra 3
 		whitelistedHevcDecoders.add("omx.mtk");
 		whitelistedHevcDecoders.add("omx.amlogic");
 		whitelistedHevcDecoders.add("omx.rk");
@@ -169,15 +169,19 @@ public class MediaCodecHelper {
     }
 
 	public static boolean decoderIsWhitelistedForHevc(String decoderName) {
+		// TODO: Shield Tablet K1/LTE?
+		//
 		// NVIDIA does partial HEVC acceleration on the Shield Tablet. I don't know
 		// whether the performance is good enough to use for streaming, but they're
 		// using the same omx.nvidia.h265.decode name as the Shield TV which has a
 		// fully accelerated HEVC pipeline. AFAIK, the only K1 device with this
 		// partially accelerated HEVC decoder is the Shield Tablet, so I'll
 		// check for it here.
-		if (Build.DEVICE.equalsIgnoreCase("shieldtablet")) {
+		//
+		// TODO: Temporarily disabled with NVIDIA HEVC support
+		/*if (Build.DEVICE.equalsIgnoreCase("shieldtablet")) {
 			return false;
-		}
+		}*/
 
 		// Google didn't have official support for HEVC (or more importantly, a CTS test) until
 		// Lollipop. I've seen some MediaTek devices on 4.4 crash when attempting to use HEVC,