diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 6604343..d4d9710 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -79,9 +79,6 @@ BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl"
 USE_CUSTOM_AUDIO_POLICY := 1
 USE_XML_AUDIO_POLICY_CONF := 1
 
-# Charger
-BOARD_CHARGER_DISABLE_INIT_BLANK := true
-
 # Dex
 ifeq ($(HOST_OS),linux)
   ifneq ($(TARGET_BUILD_VARIANT),eng)
diff --git a/system.prop b/system.prop
index a23260e..67efc16 100644
--- a/system.prop
+++ b/system.prop
@@ -6,6 +6,9 @@ persist.vendor.audio_hal.dsp_bit_width_enforce_mode=24
 # Camera
 camera.disable_zsl_mode=true
 
+# Charger
+ro.charger.disable_init_blank=true
+
 # Display
 debug.gralloc.gfx_ubwc_disable=0
 debug.sf.enable_hwc_vds=1