diff --git a/eth/stagedsync/stage_headers.go b/eth/stagedsync/stage_headers.go
index 148a65834fba5ade59d408884ca3c4638cb12aa5..d9ce8a2ff824a0447772c30492d5bd94fcdaec60 100644
--- a/eth/stagedsync/stage_headers.go
+++ b/eth/stagedsync/stage_headers.go
@@ -969,7 +969,22 @@ func DownloadAndIndexSnapshotsIfNeed(s *StageState, ctx context.Context, tx kv.R
 		}
 		expect := cfg.snapshotHashesCfg.ExpectBlocks
 		if cfg.snapshots.SegmentsAvailable() < expect {
-			return fmt.Errorf("not enough snapshots available: %d > %d", expect, cfg.snapshots.SegmentsAvailable())
+			c, err := tx.Cursor(kv.Headers)
+			if err != nil {
+				return err
+			}
+			defer c.Close()
+			firstK, _, err := c.First()
+			if err != nil {
+				return err
+			}
+			c.Close()
+			hasInDB := binary.BigEndian.Uint64(firstK)
+			if cfg.snapshots.SegmentsAvailable() < hasInDB {
+				return fmt.Errorf("not enough snapshots available: snapshots=%d, blockInDB=%d, expect=%d", cfg.snapshots.SegmentsAvailable(), hasInDB, expect)
+			} else {
+				log.Warn(fmt.Sprintf("not enough snapshots available: %d < %d, but we can re-generate them because DB has historical blocks up to: %d", cfg.snapshots.SegmentsAvailable(), expect, hasInDB))
+			}
 		}
 		if err := cfg.snapshots.Reopen(); err != nil {
 			return fmt.Errorf("ReopenIndices: %w", err)
diff --git a/turbo/snapshotsync/block_snapshots.go b/turbo/snapshotsync/block_snapshots.go
index f659103700387b8f5c863eeea2de8f11f8caa0e8..81ddf6612e81503fc6c97c278c06326e8c00b739 100644
--- a/turbo/snapshotsync/block_snapshots.go
+++ b/turbo/snapshotsync/block_snapshots.go
@@ -2005,7 +2005,7 @@ func (m *Merger) removeOldFiles(toDel []string, snapshotsDir *dir.Rw) error {
 		ext := filepath.Ext(f)
 		withoutExt := f[:len(f)-len(ext)]
 		_ = os.Remove(withoutExt + ".idx")
-		if strings.HasSuffix(f, Transactions.String()) {
+		if strings.HasSuffix(withoutExt, Transactions.String()) {
 			_ = os.Remove(withoutExt + "-to-block.idx")
 			_ = os.Remove(withoutExt + "-id.idx")
 		}