@@ -78,18 +78,6 @@
 	ctx, stop := signal.NotifyContext(context.Background(), signals...)
 	defer stop()
 
-	if !write.Exists() {
-		err = imp.Index(ctx, nil)
-		if err != nil {
-			return fault.Wrap(err, fmsg.With("Failed to index data"))
-		}
-	}
-
-	err = imp.EnsureSourcesIndexed(ctx, read)
-	if err != nil {
-		return fault.Wrap(err, fmsg.With("Failed to ensure sources indexed"))
-	}
-
 	wg := &sync.WaitGroup{}
 	wg.Add(1)
 	go func() {

@@ -40,12 +40,22 @@ parentCtx context.Context,
 ) {
 	var nextRun time.Time
 	switch {
+	case !imp.options.WriteIndex.Exists():
+		imp.options.Logger.Info(
+			"no index found, starting immediate update",
+		)
+		nextRun = time.Now()
 	case Job.LastRun.FinishedAt.Before(time.Now().Add(-24 * time.Hour)):
 		imp.options.Logger.Info(
 			"indexing last ran more than 24 hours ago, scheduling immediate update",
 		)
 		nextRun = time.Now()
 	default:
+		err := imp.EnsureSourcesIndexed(parentCtx, imp.options.ReadIndex)
+		if err != nil {
+			imp.options.Logger.Error("could not add new sources", "error", err)
+		}
+
 		nextRun = nextUTCOccurrenceOfTime(imp.config.Importer.UpdateAt)
 	}
 	SetNextRun(nextRun)