diff --git a/internal/model/puller.go b/internal/model/puller.go
index 8676e16e1..2e1548ca3 100644
--- a/internal/model/puller.go
+++ b/internal/model/puller.go
@@ -190,7 +190,9 @@ loop:
 				break loop
 			}
 			p.model.setState(p.folder, FolderIdle)
-			scanTimer.Reset(p.scanIntv)
+			if p.scanIntv > 0 {
+				scanTimer.Reset(p.scanIntv)
+			}
 			if !initialScanCompleted {
 				l.Infoln("Completed initial scan (rw) of folder", p.folder)
 				initialScanCompleted = true
diff --git a/internal/model/scanner.go b/internal/model/scanner.go
index b736fb4c9..97281aa56 100644
--- a/internal/model/scanner.go
+++ b/internal/model/scanner.go
@@ -59,6 +59,10 @@ func (s *Scanner) Serve() {
 				initialScanCompleted = true
 			}
 
+			if s.intv == 0 {
+				return
+			}
+
 			timer.Reset(s.intv)
 		}
 	}