diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index b5ef091bfc..84f5f9d855 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -1383,7 +1383,16 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
             deviceNeedsSetOutputSurfaceWorkaround = true;
             break;
           default:
-            // Workaround not required.
+            // Do nothing.
+            break;
+        }
+        switch (Util.MODEL) {
+          case "AFTA":
+          case "AFTN":
+            deviceNeedsSetOutputSurfaceWorkaround = true;
+            break;
+          default:
+            // Do nothing.
             break;
         }
         evaluatedDeviceNeedsSetOutputSurfaceWorkaround = true;