diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java
index 2421bed8a..3e9db2bab 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java
@@ -492,7 +492,6 @@ public class HuaweiSupportProvider {
                 SharedPreferences.Editor editor = sharedPrefs.edit();
                 editor.putString(DeviceSettingsPreferenceConst.PREF_ACTIVATE_DISPLAY_ON_LIFT, "p_on");
                 editor.apply();
-                setTrusleep();
             }
             onSetTime();
             getBatteryLevel();
@@ -715,6 +714,9 @@ public class HuaweiSupportProvider {
             if (getHuaweiCoordinator().supportsActivityReminder()) {
                 setActivityReminder();
             }
+            if (getHuaweiCoordinator().supportsTruSleep()) {
+                setTrusleep();
+            }
             if (getHuaweiCoordinator().supportsPromptPushMessage() && getProtocolVersion() == 2) {
                 GetNotificationCapabilitiesRequest getNotificationCapabilitiesReq = new GetNotificationCapabilitiesRequest(this);
                 getNotificationCapabilitiesReq.doPerform();
diff --git a/app/src/main/res/xml/devicesettings_trusleep.xml b/app/src/main/res/xml/devicesettings_trusleep.xml
index b3c320ba5..11c793dad 100644
--- a/app/src/main/res/xml/devicesettings_trusleep.xml
+++ b/app/src/main/res/xml/devicesettings_trusleep.xml
@@ -8,7 +8,6 @@
         android:summary="@string/huawei_trusleep_summary_light">
 
         <SwitchPreferenceCompat
-            android:enabled="false"
             android:icon="@drawable/ic_access_time"
             android:defaultValue="false"
             android:key="trusleep"