diff --git a/src/configure.rs b/src/configure.rs
index b726caf00..4d86997e7 100644
--- a/src/configure.rs
+++ b/src/configure.rs
@@ -454,11 +454,8 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
     drop(imap);
 
     progress!(ctx, 910);
-    // configuration success - write back the configured parameters with the
-    // "configured_" prefix; also write the "configured"-flag */
     // the trailing underscore is correct
     param.save_to_database(ctx, "configured_").await?;
-    ctx.sql.set_raw_config_bool("configured", true).await?;
     ctx.set_config(Config::ConfiguredTimestamp, Some(&time().to_string()))
         .await?;
 
@@ -476,6 +473,8 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
     progress!(ctx, 940);
     update_device_chats_handle.await?;
 
+    ctx.sql.set_raw_config_bool("configured", true).await?;
+
     Ok(())
 }