diff --git a/BUILD.gn b/BUILD.gn
index ac37521a7..3d646afca 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -96,8 +96,13 @@ config("extra_warnings") {
     ]
   }
   if (is_clang) {
-    # Remove when crbug.com/428099 is resolved.
-    cflags += [ "-Winconsistent-missing-override" ]
+    cflags += [
+      # Remove when crbug.com/428099 is resolved.
+      "-Winconsistent-missing-override",
+
+      # TODO(thakis): Consider enabling this, https://crbug.com/807632
+      "-Wno-implicit-fallthrough",
+    ]
   }
 }
 
diff --git a/src/vulkan_support/BUILD.gn b/src/vulkan_support/BUILD.gn
index 86376012d..046244c36 100644
--- a/src/vulkan_support/BUILD.gn
+++ b/src/vulkan_support/BUILD.gn
@@ -241,9 +241,14 @@ config("vulkan_internal_config") {
   if (is_clang || !is_win) {
     cflags = [ "-Wno-unused-function" ]
 
-    # See https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/issues/1649
-    # TODO(jmadill): Lift this once github issue is fixed.
-    cflags += [ "-Wno-ignored-attributes" ]
+    cflags += [
+      # See https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/issues/1649
+      # TODO(jmadill): Lift this once github issue is fixed.
+      "-Wno-ignored-attributes",
+
+      # TODO(thakis): Consider enabling this, https://crbug.com/807632
+      "-Wno-implicit-fallthrough",
+    ]
   }
   if (is_linux) {
     defines += [
@@ -475,6 +480,12 @@ config("spirv_tools_config") {
     ]
   }
 }
+config("spirv_tools_internal_config") {
+  if (is_clang) {
+    # TODO(thakis): Consider enabling this, https://crbug.com/807632
+    cflags = [ "-Wno-implicit-fallthrough" ]
+  }
+}
 
 static_library("spirv_tools") {
   deps = [
@@ -565,6 +576,7 @@ static_library("spirv_tools") {
     "$spirv_tools_dir/source/validate_type_unique.cpp",
   ]
   public_configs = [ ":spirv_tools_config" ]
+  configs += [ ":spirv_tools_internal_config" ]
 
   foreach(target_name, spvtools_vendor_tables) {
     deps += [ ":$target_name" ]
@@ -588,6 +600,10 @@ config("glslang_internal_config") {
       "-Wno-reorder",
     ]
   }
+  if (is_clang) {
+    # TODO(thakis): Consider enabling this, https://crbug.com/807632
+    cflags += [ "-Wno-implicit-fallthrough" ]
+  }
 }
 
 static_library("glslang") {