diff --git a/main/src/main.rs b/main/src/main.rs
index 4149e5d..87f82f0 100644
--- a/main/src/main.rs
+++ b/main/src/main.rs
@@ -66,9 +66,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let (settings, dimensions_changed) =
         SystemSettings::sync_from_embedding_provider(&db, &embedding_provider).await?;
 
-    // Now ensure runtime indexes with the correct (synced) dimensions
-    ensure_runtime_indexes(&db, settings.embedding_dimensions as usize).await?;
-
     // If dimensions changed, re-embed existing data to keep queries working.
     if dimensions_changed {
         warn!(
@@ -104,6 +101,9 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         info!("Re-embedding complete.");
     }
 
+    // Now ensure runtime indexes with the correct (synced) dimensions
+    ensure_runtime_indexes(&db, settings.embedding_dimensions as usize).await?;
+
     let reranker_pool = RerankerPool::maybe_from_config(&config)?;
 
     // Create global storage manager