diff --git a/device.mk b/device.mk
index 9d59e57f..698f9eab 100644
--- a/device.mk
+++ b/device.mk
@@ -495,8 +495,10 @@ SOONG_CONFIG_google3a_config_target_device := $(LOCAL_TARGET_PRODUCT)
 SOONG_CONFIG_NAMESPACES += gch
 SOONG_CONFIG_gch += \
 	feature \
+	disable_lazy_hal
 # Disable Legacy common hal modules for whi
 SOONG_CONFIG_gch_feature := use_lyric_hal
+SOONG_CONFIG_gch_disable_lazy_hal := true
 
 # WiFi
 PRODUCT_PACKAGES += \