diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 82874ca..db9adde 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -106,7 +106,6 @@ TARGET_USES_QTI_CAMERA_DEVICE := true
 
 # Charger
 BACKLIGHT_PATH := /sys/class/leds/lcd-backlight/brightness
-BOARD_CHARGER_ENABLE_SUSPEND := true
 BOARD_NO_CHARGER_LED := true
 
 # Crypto
diff --git a/common_prop.mk b/common_prop.mk
index 5244173..c4475ef 100644
--- a/common_prop.mk
+++ b/common_prop.mk
@@ -56,6 +56,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     vidc.enc.dcvs.extra-buff-count=2 \
 
+# Charger
+PRODUCT_PRODUCT_PROPERTIES += \
+    ro.charger.enable_suspend=true
+
 # Codec2 switch
 PRODUCT_PROPERTY_OVERRIDES += \
     debug.media.codec2=2