diff --git a/Makefile b/Makefile
index 55d581ace2..48e936e5d7 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ else ifeq ($(BUILD_TYPE),debug)
 	PG_CONFIGURE_OPTS = --enable-debug --with-openssl --enable-cassert --enable-depend
 	PG_CFLAGS = -O0 -g3 $(CFLAGS)
 	CPPFLAGS = -fsanitize=address -fsanitize=undefined -fno-sanitize-recover -Wno-cast-function-type-strict
-	LDFLAGS = -fsanitize=address -fsanitize=undefined -static-libubsan
+	LDFLAGS = -fsanitize=address -fsanitize=undefined
 else
 	$(error Bad build type '$(BUILD_TYPE)', see Makefile for options)
 endif
diff --git a/libs/walproposer/build.rs b/libs/walproposer/build.rs
index 834e77893c..d4ce4fe4b9 100644
--- a/libs/walproposer/build.rs
+++ b/libs/walproposer/build.rs
@@ -33,8 +33,8 @@ fn main() -> anyhow::Result<()> {
     {
         println!("cargo:rustc-link-arg=-fsanitize=address");
         println!("cargo:rustc-link-arg=-fsanitize=undefined");
-        println!("cargo:rustc-link-arg=-static-libasan");
-        println!("cargo:rustc-link-arg=-static-libubsan");
+        // println!("cargo:rustc-link-arg=-static-libasan");
+        //println!("cargo:rustc-link-arg=-static-libubsan");
     }
     println!("cargo:rustc-link-lib=static=pgport");
     println!("cargo:rustc-link-lib=static=pgcommon");