diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryImpl.kt
index 5afc7f96ea..7ae47bac60 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryImpl.kt
@@ -323,7 +323,7 @@ class SettingsRepositoryImpl(
     override fun setDefaultsIfNecessary(userId: String) {
         // Set Vault Settings defaults
         if (!isVaultTimeoutActionSet(userId = userId)) {
-            storeVaultTimeout(userId, VaultTimeout.ThirtyMinutes)
+            storeVaultTimeout(userId, VaultTimeout.FifteenMinutes)
             storeVaultTimeoutAction(userId, VaultTimeoutAction.LOCK)
         }
     }
diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryTest.kt
index 078c892280..39f080c37d 100644
--- a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryTest.kt
@@ -78,7 +78,7 @@ class SettingsRepositoryTest {
 
         // Calling once sets values
         assertEquals(
-            30,
+            15,
             fakeSettingsDiskSource.getVaultTimeoutInMinutes(userId = userId),
         )
         assertEquals(