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 eb9fd900..6bc1d788 100644
--- a/app/src/main/java/com/limelight/binding/video/MediaCodecHelper.java
+++ b/app/src/main/java/com/limelight/binding/video/MediaCodecHelper.java
@@ -97,10 +97,13 @@ public class MediaCodecHelper {
         baselineProfileHackPrefixes = new LinkedList<>();
         baselineProfileHackPrefixes.add("omx.intel");
 
+		blacklistedAdaptivePlaybackPrefixes = new LinkedList<>();
 		// The Intel decoder on Lollipop on Nexus Player would increase latency badly
 		// if adaptive playback was enabled so let's avoid it to be safe.
-		blacklistedAdaptivePlaybackPrefixes = new LinkedList<>();
 		blacklistedAdaptivePlaybackPrefixes.add("omx.intel");
+		// The MediaTek decoder crashes at 1080p when adaptive playback is enabled
+		// on some Android TV devices with H.265 only.
+		blacklistedAdaptivePlaybackPrefixes.add("omx.mtk");
 
 		constrainedHighProfilePrefixes = new LinkedList<>();
 		constrainedHighProfilePrefixes.add("omx.intel");
diff --git a/decoder-errata.txt b/decoder-errata.txt
index f2321095..650f8d8b 100644
--- a/decoder-errata.txt
+++ b/decoder-errata.txt
@@ -32,3 +32,6 @@ This file serves to document some of the decoder errata when using MediaCodec ha
 
 11. Attempting to use reference picture invalidation at 1080p causes the decoder to crash on low-end Snapdragon SoCs. 720p is unaffected.
 	- Affected decoders: Snapdragon 200, 410, 415, 430, 435, 616
+
+12. Enabling adaptive playback causes H.265 1080p and 4K playback to fail on some MediaTek SoCs.
+	- Affected decoders: MT5832 in Sony BRAVIA 4K GB (BRAVIA_ATV2) and MT5890 in Phillips 55PUS6501