diff --git a/src/dawn_native/ShaderModule.cpp b/src/dawn_native/ShaderModule.cpp
index fbbe114e8d..40ed3723db 100644
--- a/src/dawn_native/ShaderModule.cpp
+++ b/src/dawn_native/ShaderModule.cpp
@@ -1097,6 +1097,7 @@ namespace dawn_native {
     shaderc_spvc::CompileOptions ShaderModuleBase::GetCompileOptions() const {
         shaderc_spvc::CompileOptions options;
         options.SetValidate(GetDevice()->IsValidationEnabled());
+        options.SetRobustBufferAccessPass(GetDevice()->IsRobustnessEnabled());
         return options;
     }