diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 6ba23b37..ce4dcc2f 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -108,7 +108,6 @@ BOARD_QTI_CAMERA_32BIT_ONLY := true
 TARGET_USES_MEDIA_EXTENSIONS := true
 
 # Charger
-BOARD_CHARGER_DISABLE_INIT_BLANK := true
 HEALTHD_USE_BATTERY_INFO := true
 
 # Clang
diff --git a/common_prop.mk b/common_prop.mk
index 78785f03..1514a8a3 100644
--- a/common_prop.mk
+++ b/common_prop.mk
@@ -137,6 +137,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # Charger
 PRODUCT_PRODUCT_PROPERTIES += \
+    ro.charger.disable_init_blank=true \
     ro.charger.enable_suspend=true
 
 # Codec2 switch