diff --git a/services/core/java/com/android/server/lineage/health/ChargingControlController.java b/services/core/java/com/android/server/lineage/health/ChargingControlController.java
index b584a289954d..cf4f7a97d5bb 100644
--- a/services/core/java/com/android/server/lineage/health/ChargingControlController.java
+++ b/services/core/java/com/android/server/lineage/health/ChargingControlController.java
@@ -142,7 +142,8 @@ public ChargingControlController(Context context, Handler handler) {
 
         mContentResolver = mContext.getContentResolver();
         mChargingControl = IChargingControl.Stub.asInterface(
-                ServiceManager.getService(IChargingControl.DESCRIPTOR + "/default"));
+                ServiceManager.waitForDeclaredService(
+                        IChargingControl.DESCRIPTOR + "/default"));
 
         if (mChargingControl == null) {
             Log.i(TAG, "Lineage Health HAL not found");