diff --git a/BUILD.gn b/BUILD.gn
index b9a3f3ab9..e41b9937d 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -77,6 +77,12 @@ source_set("libyuv") {
     defines += [ "HAVE_JPEG" ]
   }
 
+  if (is_msan) {
+    # MemorySanitizer does not support assembly code yet.
+    # http://crbug.com/344505
+    defines += [ "LIBYUV_DISABLE_X86" ]
+  }
+
   deps = [
     "//third_party:jpeg",
   ]
diff --git a/libyuv.gyp b/libyuv.gyp
index d067a05dd..cc4b0f88f 100644
--- a/libyuv.gyp
+++ b/libyuv.gyp
@@ -104,6 +104,13 @@
             'LIBYUV_NEON',
           ]
         }],
+        # MemorySanitizer does not support assembly code yet.
+        # http://crbug.com/344505
+        [ 'msan == 1', {
+          'defines': [
+            'LIBYUV_DISABLE_X86',
+          ],
+        }],
       ],
       'defines': [
         # Enable the following 3 macros to turn off assembly for specified CPU.