diff --git a/infra/base-images/msan-builder/compiler_wrapper.py b/infra/base-images/msan-builder/compiler_wrapper.py
index 612ce7f7a..5f624d582 100755
--- a/infra/base-images/msan-builder/compiler_wrapper.py
+++ b/infra/base-images/msan-builder/compiler_wrapper.py
@@ -36,7 +36,7 @@ def RemoveZDefs(args):
   filtered = []
 
   for arg in args:
-    if arg == '-Wl,-z,defs':
+    if arg == '-Wl,-z,defs' or arg == '-Wl,--no-undefined':
       continue
 
     if arg == '-Wl,defs':