diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 7f9c2a1..c7d5129 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -159,6 +159,10 @@
 # Enable sensor Version V_2
 USE_SENSOR_HAL_VER := 2.0
 
+# CHRE
+CHRE_DAEMON_ENABLED := true
+CHRE_DAEMON_LOAD_INTO_SENSORSPD := true
+
 # wlan
 BOARD_WLAN_DEVICE := qcwcn
 BOARD_WPA_SUPPLICANT_DRIVER := NL80211
diff --git a/init.hardware.rc b/init.hardware.rc
index 6af35e9..09220f0 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -717,13 +717,6 @@
     oneshot
     keycodes 114 115 116
 
-service vendor.chre /vendor/bin/chre
-    class late_start
-    user system
-    group system
-    socket chre seqpacket 0660 root system
-    shutdown critical
-
 service devstart_sh /vendor/bin/init.qcom.devstart.sh
     class main
     user root