diff --git a/internal/torrent/manager.go b/internal/torrent/manager.go
index 6b03a51..2ca244d 100644
--- a/internal/torrent/manager.go
+++ b/internal/torrent/manager.go
@@ -31,7 +31,6 @@ type TorrentManager struct {
 	latestState     *LibraryState
 	requiredVersion string
 	workerPool      *ants.Pool
-	repairWorker    *ants.Pool
 	log             *logutil.Logger
 }
 
@@ -95,11 +94,6 @@ func NewTorrentManager(cfg config.ConfigInterface, api *realdebrid.RealDebrid, p
 	t.SetNewLatestState(t.getCurrentState())
 
 	if t.Config.EnableRepair() {
-		repairWorker, err := ants.NewPool(1)
-		if err != nil {
-			log.Fatalf("Failed to create repair worker: %v", err)
-		}
-		t.repairWorker = repairWorker
 		t.RepairAll() // initial repair
 	} else {
 		t.log.Info("Repair is disabled, skipping repair check")
diff --git a/internal/torrent/repair.go b/internal/torrent/repair.go
index d14bd01..0f12d51 100644
--- a/internal/torrent/repair.go
+++ b/internal/torrent/repair.go
@@ -12,10 +12,13 @@ import (
 	cmap "github.com/orcaman/concurrent-map/v2"
 )
 
-const EXPIRED_LINK_TOLERANCE_HOURS = 24
+const (
+	EXPIRED_LINK_TOLERANCE_HOURS = 24
+	REPAIR_SEMAPHORE             = "semaphore"
+)
 
 func (t *TorrentManager) RepairAll() {
-	_ = t.repairWorker.Submit(func() {
+	_ = t.workerPool.Submit(func() {
 		t.log.Info("Repairing all broken torrents")
 		t.repairAll()
 		t.log.Info("Finished repairing all torrents")
@@ -93,21 +96,22 @@ func (t *TorrentManager) repairAll() {
 	t.log.Debugf("Found %d broken torrents to repair in total", len(toRepair))
 	for i := range toRepair {
 		torrent := toRepair[i]
-		t.log.Infof("Repairing %s", t.GetKey(torrent))
-		t.repair(torrent)
+		t.Repair(torrent)
 	}
 }
 
 func (t *TorrentManager) Repair(torrent *Torrent) {
+	// save the broken files to the file cache
 	infoCache, _ := t.DirectoryMap.Get(INT_INFO_CACHE)
 	torrent.DownloadedIDs.Each(func(id string) bool {
 		infoCache.Set(id, torrent)
 		t.writeTorrentToFile(id, torrent, false)
 		return false
 	})
-	_ = t.repairWorker.Submit(func() {
+	_ = t.workerPool.Submit(func() {
 		t.log.Infof("Repairing torrent %s", t.GetKey(torrent))
 		t.repair(torrent)
+		torrent.InProgressIDs.Remove(REPAIR_SEMAPHORE)
 		t.log.Infof("Finished repairing torrent %s", t.GetKey(torrent))
 	})
 }
@@ -118,6 +122,8 @@ func (t *TorrentManager) repair(torrent *Torrent) {
 		return
 	}
 
+	torrent.InProgressIDs.Add(REPAIR_SEMAPHORE)
+
 	proceed := t.canCapacityHandle() // blocks for approx 45 minutes if active torrents are full
 	if !proceed {
 		t.log.Error("Reached the max number of active torrents, cannot continue with the repair")
@@ -140,9 +146,6 @@ func (t *TorrentManager) repair(torrent *Torrent) {
 		t.log.Warnf("Torrent %s is not older than %d hours to be repaired by reinsertion, will only redownload broken files...", t.GetKey(torrent), EXPIRED_LINK_TOLERANCE_HOURS)
 	}
 
-	// sleep for 30 seconds to let the torrent accumulate more broken files if scanning
-	time.Sleep(30 * time.Second)
-
 	// handle rar'ed torrents
 	assignedCount := 0
 	rarCount := 0
@@ -271,7 +274,6 @@ func (t *TorrentManager) reinsertTorrent(torrent *Torrent, brokenFiles string) b
 		t.Api.DeleteTorrent(newTorrentID)
 		return false
 	}
-	time.Sleep(10 * time.Second)
 
 	// see if the torrent is ready
 	info, err := t.Api.GetTorrentInfo(newTorrentID)