diff --git a/doze/src/org/lineageos/settings/doze/DozeSettingsFragment.java b/doze/src/org/lineageos/settings/doze/DozeSettingsFragment.java
index 61a9952c3ec7d7680d11d23b9f71ad9c211f8a91..55609c5a9b5c2637ca6bf28bf497d0ea159ae77d 100644
--- a/doze/src/org/lineageos/settings/doze/DozeSettingsFragment.java
+++ b/doze/src/org/lineageos/settings/doze/DozeSettingsFragment.java
@@ -24,6 +24,7 @@ import android.app.DialogFragment;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.os.Handler;
 import androidx.preference.PreferenceFragment;
 import androidx.preference.SwitchPreference;
 import androidx.preference.Preference;
@@ -43,6 +44,8 @@ public class DozeSettingsFragment extends PreferenceFragment implements
     private SwitchPreference mHandwavePreference;
     private SwitchPreference mPocketPreference;
 
+    private Handler mHandler = new Handler();
+
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         addPreferencesFromResource(R.xml.doze_settings);
@@ -82,8 +85,8 @@ public class DozeSettingsFragment extends PreferenceFragment implements
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
-        DozeUtils.enableGesture(getActivity(), preference.getKey(), (Boolean) newValue);
-        DozeUtils.checkDozeService(getActivity());
+        mHandler.post(() -> DozeUtils.checkDozeService(getActivity()));
+
         return true;
     }
 
diff --git a/doze/src/org/lineageos/settings/doze/DozeUtils.java b/doze/src/org/lineageos/settings/doze/DozeUtils.java
index a94cf0b46fd276ba77cc02d7ce946538cd8a26ea..f1ed8bfc48aca419c4e3421cae4e7e14e6005ea0 100644
--- a/doze/src/org/lineageos/settings/doze/DozeUtils.java
+++ b/doze/src/org/lineageos/settings/doze/DozeUtils.java
@@ -96,11 +96,6 @@ public final class DozeUtils {
         }
     }
 
-    protected static void enableGesture(Context context, String gesture, boolean enable) {
-        PreferenceManager.getDefaultSharedPreferences(context).edit()
-                .putBoolean(gesture, enable).apply();
-    }
-
     protected static boolean isGestureEnabled(Context context, String gesture) {
         return PreferenceManager.getDefaultSharedPreferences(context)
                 .getBoolean(gesture, false);