diff --git a/lib/model/model.go b/lib/model/model.go
index 6deb259d733..43a13784fc3 100644
--- a/lib/model/model.go
+++ b/lib/model/model.go
@@ -1682,8 +1682,11 @@ func (m *model) handleAutoAccepts(deviceID protocol.DeviceID, folder protocol.Fo
 				fcfg.Type = config.FolderTypeReceiveEncrypted
 				// Override the user-configured defaults, as normally done by the GUI
 				fcfg.FSWatcherEnabled = false
-				if fcfg.RescanIntervalS == 60 || fcfg.RescanIntervalS == 3600 {
-					fcfg.RescanIntervalS = 3600 * 24
+				if fcfg.RescanIntervalS != 0 {
+					minRescanInterval := 3600 * 24
+					if fcfg.RescanIntervalS < minRescanInterval {
+						fcfg.RescanIntervalS = minRescanInterval
+					}
 				}
 				fcfg.Versioning.Reset()
 				// Other necessary settings are ensured by FolderConfiguration itself