diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keysync/KeyserverSyncManager.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keysync/KeyserverSyncManager.java
index ada2614bf..228a50518 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keysync/KeyserverSyncManager.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keysync/KeyserverSyncManager.java
@@ -55,8 +55,6 @@ public class KeyserverSyncManager {
             return;
         }
 
-        /* Periodic syncs can't be unique, so we just use this to launch a uniquely queued worker */
-
         Builder constraints = new Builder()
                 .setRequiredNetworkType(prefs.getWifiOnlySync() ? NetworkType.UNMETERED : NetworkType.CONNECTED)
                 .setRequiresBatteryNotLow(true);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java
index cc064aa26..46b5f3a7d 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java
@@ -399,8 +399,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
      * This fragment shows the keyserver/wifi-only-sync/contacts sync preferences
      */
     public static class SyncPrefsFragment extends PresetPreferenceFragment {
-        boolean syncPrefChanged = false;
-
         @Override
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
@@ -410,19 +408,14 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
 
             findPreference(Constants.Pref.SYNC_KEYSERVER).setOnPreferenceChangeListener(
                     (preference, newValue) -> {
-                        syncPrefChanged = true;
                         return true;
                     });
         }
 
         @Override
-        public void onPause() {
-            super.onPause();
-
-            if (syncPrefChanged) {
-                KeyserverSyncManager.updateKeyserverSyncSchedule(getActivity(), true);
-                syncPrefChanged = false;
-            }
+        public void onStop() {
+            super.onStop();
+            KeyserverSyncManager.updateKeyserverSyncSchedule(getActivity(), true);
         }
 
         @Override