diff --git a/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/DefaultAppPreferencesStore.kt b/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/DefaultAppPreferencesStore.kt
index f8db0c11ee..1a14a0ea8f 100644
--- a/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/DefaultAppPreferencesStore.kt
+++ b/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/DefaultAppPreferencesStore.kt
@@ -47,7 +47,7 @@ private val callRingtoneDisplayNameKey = stringPreferencesKey("notificationCallR
 
 // URLs never contain a newline, so it is a safe delimiter to persist an ordered list in a single String.
 private const val HOMESERVER_HISTORY_DELIMITER = "\n"
-private const val MAX_HOMESERVER_HISTORY_SIZE = 10
+private const val MAX_HOMESERVER_HISTORY_SIZE = 20
 
 @ContributesBinding(AppScope::class)
 class DefaultAppPreferencesStore(
diff --git a/libraries/preferences/impl/src/test/kotlin/io/element/android/libraries/preferences/impl/store/DefaultAppPreferencesStoreTest.kt b/libraries/preferences/impl/src/test/kotlin/io/element/android/libraries/preferences/impl/store/DefaultAppPreferencesStoreTest.kt
index fbb9005ea5..4cf018371a 100644
--- a/libraries/preferences/impl/src/test/kotlin/io/element/android/libraries/preferences/impl/store/DefaultAppPreferencesStoreTest.kt
+++ b/libraries/preferences/impl/src/test/kotlin/io/element/android/libraries/preferences/impl/store/DefaultAppPreferencesStoreTest.kt
@@ -110,13 +110,13 @@ class DefaultAppPreferencesStoreTest {
     fun `homeserver history is capped to the most recent entries`() = runTest {
         val store = createStore()
 
-        repeat(15) { index ->
+        repeat(25) { index ->
             store.addHomeserverToHistory("https://server$index.org")
         }
 
         val history = store.getHomeserverHistoryFlow().first()
-        assertThat(history).hasSize(10)
-        assertThat(history.first()).isEqualTo("https://server14.org")
+        assertThat(history).hasSize(20)
+        assertThat(history.first()).isEqualTo("https://server24.org")
         assertThat(history.last()).isEqualTo("https://server5.org")
     }