diff --git a/cmd/gonic/gonic.go b/cmd/gonic/gonic.go
index f81b732d..9a2c6faf 100644
--- a/cmd/gonic/gonic.go
+++ b/cmd/gonic/gonic.go
@@ -299,12 +299,13 @@ func main() {
 
 		defer logJob("scan watcher")()
 
+		done := make(chan struct{})
 		errgrp.Go(func() error {
 			<-ctx.Done()
-			scannr.CancelWatch()
+			done <- struct{}{}
 			return nil
 		})
-		return scannr.ExecuteWatch()
+		return scannr.ExecuteWatch(done)
 	})
 
 	errgrp.Go(func() error {
diff --git a/scanner/scanner.go b/scanner/scanner.go
index 65fa1cf6..7f755ee9 100644
--- a/scanner/scanner.go
+++ b/scanner/scanner.go
@@ -34,9 +34,6 @@ type Scanner struct {
 	tagReader          tagcommon.Reader
 	excludePattern     *regexp.Regexp
 	scanning           *int32
-	watcher            *fsnotify.Watcher
-	watchMap           map[string]string // maps watched dirs back to root music dir
-	watchDone          chan bool
 }
 
 func New(musicDirs []string, db *db.DB, multiValueSettings map[Tag]MultiValueSetting, tagReader tagcommon.Reader, excludePattern string) *Scanner {
@@ -52,22 +49,12 @@ func New(musicDirs []string, db *db.DB, multiValueSettings map[Tag]MultiValueSet
 		tagReader:          tagReader,
 		excludePattern:     excludePatternRegExp,
 		scanning:           new(int32),
-		watchMap:           make(map[string]string),
-		watchDone:          make(chan bool),
 	}
 }
 
-func (s *Scanner) IsScanning() bool {
-	return atomic.LoadInt32(s.scanning) == 1
-}
-
-func (s *Scanner) StartScanning() bool {
-	return atomic.CompareAndSwapInt32(s.scanning, 0, 1)
-}
-
-func (s *Scanner) StopScanning() {
-	defer atomic.StoreInt32(s.scanning, 0)
-}
+func (s *Scanner) IsScanning() bool    { return atomic.LoadInt32(s.scanning) == 1 }
+func (s *Scanner) StartScanning() bool { return atomic.CompareAndSwapInt32(s.scanning, 0, 1) }
+func (s *Scanner) StopScanning()       { defer atomic.StoreInt32(s.scanning, 0) }
 
 type ScanOptions struct {
 	IsFull bool
@@ -94,7 +81,7 @@ func (s *Scanner) ScanAndClean(opts ScanOptions) (*Context, error) {
 
 	for _, dir := range s.musicDirs {
 		err := filepath.WalkDir(dir, func(absPath string, d fs.DirEntry, err error) error {
-			return s.scanCallback(c, dir, absPath, d, err)
+			return s.scanCallback(c, absPath, d, err)
 		})
 		if err != nil {
 			return nil, fmt.Errorf("walk: %w", err)
@@ -121,93 +108,82 @@ func (s *Scanner) ScanAndClean(opts ScanOptions) (*Context, error) {
 	return c, errors.Join(c.errs...)
 }
 
-func (s *Scanner) ExecuteWatch() error {
-	var err error
-	s.watcher, err = fsnotify.NewWatcher()
+func (s *Scanner) ExecuteWatch(done <-chan struct{}) error {
+	watcher, err := fsnotify.NewWatcher()
 	if err != nil {
-		log.Printf("error creating watcher: %v\n", err)
-		return err
+		return fmt.Errorf("creating watcher: %w", err)
 	}
-	defer s.watcher.Close()
+	defer watcher.Close()
 
-	t := time.NewTimer(10 * time.Second)
-	if !t.Stop() {
-		<-t.C
-	}
+	const batchInterval = 10 * time.Second
+	batchT := time.NewTimer(batchInterval)
+	batchT.Stop()
 
 	for _, dir := range s.musicDirs {
 		err := filepath.WalkDir(dir, func(absPath string, d fs.DirEntry, err error) error {
-			return s.watchCallback(dir, absPath, d, err)
+			return watchCallback(watcher, absPath, d, err)
 		})
 		if err != nil {
 			log.Printf("error watching directory tree: %v\n", err)
+			continue
 		}
 	}
 
-	scanList := map[string]struct{}{}
+	batchSeen := map[string]struct{}{}
 	for {
 		select {
-		case <-t.C:
+		case <-batchT.C:
 			if !s.StartScanning() {
-				scanList = map[string]struct{}{}
 				break
 			}
-			for dirName := range scanList {
+			for absPath := range batchSeen {
 				c := &Context{
 					seenTracks: map[int]struct{}{},
 					seenAlbums: map[int]struct{}{},
-					isFull:     false,
-				}
-				musicDirName := s.watchMap[dirName]
-				if musicDirName == "" {
-					musicDirName = s.watchMap[filepath.Dir(dirName)]
 				}
-				err = filepath.WalkDir(dirName, func(absPath string, d fs.DirEntry, err error) error {
-					return s.watchCallback(musicDirName, absPath, d, err)
+				err = filepath.WalkDir(absPath, func(absPath string, d fs.DirEntry, err error) error {
+					return watchCallback(watcher, absPath, d, err)
 				})
 				if err != nil {
 					log.Printf("error watching directory tree: %v\n", err)
+					continue
 				}
-				err = filepath.WalkDir(dirName, func(absPath string, d fs.DirEntry, err error) error {
-					return s.scanCallback(c, musicDirName, absPath, d, err)
+				err = filepath.WalkDir(absPath, func(absPath string, d fs.DirEntry, err error) error {
+					return s.scanCallback(c, absPath, d, err)
 				})
 				if err != nil {
 					log.Printf("error walking: %v", err)
+					continue
 				}
 			}
-			scanList = map[string]struct{}{}
 			s.StopScanning()
-		case event := <-s.watcher.Events:
-			var dirName string
+			clear(batchSeen)
+
+		case event := <-watcher.Events:
 			if event.Op&(fsnotify.Create|fsnotify.Write) == 0 {
 				break
 			}
-			if len(scanList) == 0 {
-				t.Reset(10 * time.Second)
-			}
 			fileInfo, err := os.Stat(event.Name)
 			if err != nil {
 				break
 			}
 			if fileInfo.IsDir() {
-				dirName = event.Name
+				batchSeen[event.Name] = struct{}{}
 			} else {
-				dirName = filepath.Dir(event.Name)
+				batchSeen[filepath.Dir(event.Name)] = struct{}{}
 			}
-			scanList[dirName] = struct{}{}
-		case err = <-s.watcher.Errors:
+			batchT.Reset(batchInterval)
+
+		case err = <-watcher.Errors:
 			log.Printf("error from watcher: %v\n", err)
-		case <-s.watchDone:
+
+		case <-done:
 			return nil
 		}
 	}
 }
 
-func (s *Scanner) CancelWatch() {
-	s.watchDone <- true
-}
-
-func (s *Scanner) watchCallback(dir string, absPath string, d fs.DirEntry, err error) error {
+func watchCallback(watcher *fsnotify.Watcher, absPath string, d fs.DirEntry, err error) error {
 	if err != nil {
 		return err
 	}
@@ -218,27 +194,23 @@ func (s *Scanner) watchCallback(dir string, absPath string, d fs.DirEntry, err e
 		eval, _ := filepath.EvalSymlinks(absPath)
 		return filepath.WalkDir(eval, func(subAbs string, d fs.DirEntry, err error) error {
 			subAbs = strings.Replace(subAbs, eval, absPath, 1)
-			return s.watchCallback(dir, subAbs, d, err)
+			return watchCallback(watcher, subAbs, d, err)
 		})
 	default:
 		return nil
 	}
 
-	if s.watchMap[absPath] == "" {
-		s.watchMap[absPath] = dir
-		err = s.watcher.Add(absPath)
+	if err := watcher.Add(absPath); err != nil {
+		return fmt.Errorf("add path to watcher: %w", err)
 	}
-	return err
+	return nil
 }
 
-func (s *Scanner) scanCallback(c *Context, dir string, absPath string, d fs.DirEntry, err error) error {
+func (s *Scanner) scanCallback(c *Context, absPath string, d fs.DirEntry, err error) error {
 	if err != nil {
 		c.errs = append(c.errs, err)
 		return nil
 	}
-	if dir == absPath {
-		return nil
-	}
 
 	switch d.Type() {
 	case os.ModeDir:
@@ -246,7 +218,7 @@ func (s *Scanner) scanCallback(c *Context, dir string, absPath string, d fs.DirE
 		eval, _ := filepath.EvalSymlinks(absPath)
 		return filepath.WalkDir(eval, func(subAbs string, d fs.DirEntry, err error) error {
 			subAbs = strings.Replace(subAbs, eval, absPath, 1)
-			return s.scanCallback(c, dir, subAbs, d, err)
+			return s.scanCallback(c, subAbs, d, err)
 		})
 	default:
 		return nil
@@ -260,7 +232,7 @@ func (s *Scanner) scanCallback(c *Context, dir string, absPath string, d fs.DirE
 	log.Printf("processing folder `%s`", absPath)
 
 	tx := s.db.Begin()
-	if err := s.scanDir(tx, c, dir, absPath); err != nil {
+	if err := s.scanDir(tx, c, absPath); err != nil {
 		c.errs = append(c.errs, fmt.Errorf("%q: %w", absPath, err))
 		tx.Rollback()
 		return nil
@@ -272,7 +244,12 @@ func (s *Scanner) scanCallback(c *Context, dir string, absPath string, d fs.DirE
 	return nil
 }
 
-func (s *Scanner) scanDir(tx *db.DB, c *Context, musicDir string, absPath string) error {
+func (s *Scanner) scanDir(tx *db.DB, c *Context, absPath string) error {
+	musicDir, relPath := musicDirRelative(s.musicDirs, absPath)
+	if musicDir == absPath {
+		return nil
+	}
+
 	items, err := os.ReadDir(absPath)
 	if err != nil {
 		return err
@@ -300,7 +277,6 @@ func (s *Scanner) scanDir(tx *db.DB, c *Context, musicDir string, absPath string
 		}
 	}
 
-	relPath, _ := filepath.Rel(musicDir, absPath)
 	pdir, pbasename := filepath.Split(filepath.Dir(relPath))
 	var parent db.Album
 	if err := tx.Where("root_dir=? AND left_path=? AND right_path=?", musicDir, pdir, pbasename).Assign(db.Album{RootDir: musicDir, LeftPath: pdir, RightPath: pbasename}).FirstOrCreate(&parent).Error; err != nil {
@@ -701,3 +677,13 @@ func parseMulti(parser tagcommon.Info, setting MultiValueSetting, getMulti func(
 	}
 	return parts
 }
+
+func musicDirRelative(musicDirs []string, absPath string) (musicDir, relPath string) {
+	for _, musicDir := range musicDirs {
+		if strings.HasPrefix(absPath, musicDir) {
+			relPath, _ = filepath.Rel(musicDir, absPath)
+			return musicDir, relPath
+		}
+	}
+	return
+}