diff --git a/BoardConfig.mk b/BoardConfig.mk
index 8f7227c..da6f36b 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -68,9 +68,6 @@ TARGET_NO_BOOTLOADER := true
 # Camera
 TARGET_USES_QTI_CAMERA_DEVICE := true
 
-# Charger
-BOARD_CHARGER_ENABLE_SUSPEND := true
-
 # Display
 TARGET_HAS_HDR_DISPLAY := true
 TARGET_HAS_WIDE_COLOR_DISPLAY := true
diff --git a/system.prop b/system.prop
index efad7e3..b16567c 100644
--- a/system.prop
+++ b/system.prop
@@ -5,6 +5,9 @@ vendor.bluetooth.soc=cherokee
 persist.camera.gyro.disable=0
 vendor.camera.aux.packagelist=org.codeaurora.snapcam,com.android.camera,org.lineageos.snap
 
+# Charger
+ro.charger.enable_suspend=true
+
 # CNE
 persist.vendor.cne.feature=1