diff --git a/crosshatch_car/device-common.mk b/crosshatch_car/device-common.mk
index 73d5389..da765fb 100644
--- a/crosshatch_car/device-common.mk
+++ b/crosshatch_car/device-common.mk
@@ -140,9 +140,13 @@
 #
 
 # Enable retrofit dynamic partitions for all blueline
-# and crosshatch targets
+# and crosshatch (except for hwaddress) targets
 PRODUCT_USE_DYNAMIC_PARTITIONS := true
+ifneq (,$(filter hwaddress, $(SANITIZE_TARGET)))
+PRODUCT_RETROFIT_DYNAMIC_PARTITIONS := false
+else
 PRODUCT_RETROFIT_DYNAMIC_PARTITIONS := true
+endif
 PRODUCT_PACKAGES += \
     android.hardware.boot@1.0-impl.recovery \
     bootctrl.sdm845 \