diff --git a/shell/common/io_manager.cc b/shell/common/io_manager.cc
index e97222eb40e70..c6ff79b644f30 100644
--- a/shell/common/io_manager.cc
+++ b/shell/common/io_manager.cc
@@ -24,6 +24,7 @@ sk_sp<GrContext> IOManager::CreateCompatibleResourceLoadingContext(
   // thread. The necessary work isn't being flushed or synchronized with the
   // other threads correctly, so the textures end up blank.  For now, suppress
   // that feature, which will cause texture uploads to do CPU YUV conversion.
+  // A similar work-around is also used in shell/gpu/gpu_surface_gl.cc.
   options.fDisableGpuYUVConversion = true;
 
   // To get video playback on the widest range of devices, we limit Skia to
diff --git a/shell/gpu/gpu_surface_gl.cc b/shell/gpu/gpu_surface_gl.cc
index d0ff74ffb6e24..675e6d6f7cacf 100644
--- a/shell/gpu/gpu_surface_gl.cc
+++ b/shell/gpu/gpu_surface_gl.cc
@@ -56,6 +56,10 @@ GPUSurfaceGL::GPUSurfaceGL(GPUSurfaceGLDelegate* delegate)
   // ES2 shading language when the ES3 external image extension is missing.
   options.fPreferExternalImagesOverES3 = true;
 
+  // TODO(goderbauer): remove option when skbug.com/7523 is fixed.
+  // A similar work-around is also used in shell/common/io_manager.cc.
+  options.fDisableGpuYUVConversion = true;
+
   sk_sp<const GrGLInterface> interface;
 
   if (proc_resolver_ == nullptr) {