diff --git a/vector/src/main/java/im/vector/app/features/settings/BackgroundSyncMode.kt b/vector/src/main/java/im/vector/app/features/settings/BackgroundSyncMode.kt
index 2dcb663fc1..9d8b5755b0 100644
--- a/vector/src/main/java/im/vector/app/features/settings/BackgroundSyncMode.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/BackgroundSyncMode.kt
@@ -39,6 +39,9 @@ enum class BackgroundSyncMode {
     FDROID_BACKGROUND_SYNC_MODE_DISABLED;
 
     companion object {
+        const val DEFAULT_SYNC_DELAY_SECONDS = 60
+        const val DEFAULT_SYNC_TIMEOUT_SECONDS = 6
+
         fun fromString(value: String?): BackgroundSyncMode = values().firstOrNull { it.name == value }
                 ?: FDROID_BACKGROUND_SYNC_MODE_DISABLED
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
index 2239efa992..7415b57310 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -837,8 +837,8 @@ class VectorPreferences @Inject constructor(private val context: Context) {
     fun backgroundSyncTimeOut(): Int {
         return tryThis {
             // The xml pref is saved as a string so use getString and parse
-            defaultPrefs.getString(SETTINGS_SET_SYNC_TIMEOUT_PREFERENCE_KEY, "6")?.toInt()
-        } ?: 6
+            defaultPrefs.getString(SETTINGS_SET_SYNC_TIMEOUT_PREFERENCE_KEY, null)?.toInt()
+        } ?: BackgroundSyncMode.DEFAULT_SYNC_TIMEOUT_SECONDS
     }
 
     fun setBackgroundSyncTimeout(timeInSecond: Int) {
@@ -851,8 +851,8 @@ class VectorPreferences @Inject constructor(private val context: Context) {
     fun backgroundSyncDelay(): Int {
         return tryThis {
             // The xml pref is saved as a string so use getString and parse
-            defaultPrefs.getString(SETTINGS_SET_SYNC_DELAY_PREFERENCE_KEY, "60")?.toInt()
-        } ?: 60
+            defaultPrefs.getString(SETTINGS_SET_SYNC_DELAY_PREFERENCE_KEY, null)?.toInt()
+        } ?: BackgroundSyncMode.DEFAULT_SYNC_DELAY_SECONDS
     }
 
     fun setBackgroundSyncDelay(timeInSecond: Int) {
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt
index e7b9c3cb2a..3f74c4db75 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt
@@ -88,7 +88,7 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
             it.summary = secondsToText(vectorPreferences.backgroundSyncTimeOut())
             it.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
                 if (newValue is String) {
-                    val syncTimeout = tryThis { Integer.parseInt(newValue) } ?: 6
+                    val syncTimeout = tryThis { Integer.parseInt(newValue) } ?: BackgroundSyncMode.DEFAULT_SYNC_TIMEOUT_SECONDS
                     vectorPreferences.setBackgroundSyncTimeout(maxOf(0, syncTimeout))
                     refreshBackgroundSyncPrefs()
                 }
@@ -101,7 +101,7 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
             it.summary = secondsToText(vectorPreferences.backgroundSyncDelay())
             it.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
                 if (newValue is String) {
-                    val syncDelay = tryThis { Integer.parseInt(newValue) } ?: 6
+                    val syncDelay = tryThis { Integer.parseInt(newValue) } ?: BackgroundSyncMode.DEFAULT_SYNC_DELAY_SECONDS
                     vectorPreferences.setBackgroundSyncDelay(maxOf(0, syncDelay))
                     refreshBackgroundSyncPrefs()
                 }