diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/configuration/KomgaProperties.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/configuration/KomgaProperties.kt
index af733469b..ee55793e4 100644
--- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/configuration/KomgaProperties.kt
+++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/configuration/KomgaProperties.kt
@@ -13,6 +13,8 @@ import javax.validation.constraints.Positive
 class KomgaProperties {
   var librariesScanCron: String = ""
 
+  var librariesScanStartup: Boolean = false
+
   var librariesScanDirectoryExclusions: List<String> = emptyList()
 
   var filesystemScannerForceDirectoryModifiedTime: Boolean = false
@@ -21,10 +23,7 @@ class KomgaProperties {
 
   class Threads {
     @Min(1)
-    @Deprecated("Deprecated since 0.10", ReplaceWith("analyzer"))
-    var parse: Int = 2
-
-    @Min(1)
+    @Deprecated("Deprecated since 0.28")
     var analyzer: Int = 2
   }
 
diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/PeriodicScannerController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/PeriodicScannerController.kt
index 5c0c6f263..73afa2a40 100644
--- a/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/PeriodicScannerController.kt
+++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/PeriodicScannerController.kt
@@ -16,7 +16,7 @@ class PeriodicScannerController(
   private val taskReceiver: TaskReceiver
 ) {
 
-  @EventListener(ApplicationReadyEvent::class)
+  @EventListener(classes = [ApplicationReadyEvent::class], condition = "@komgaProperties.librariesScanStartup")
   @Scheduled(cron = "#{@komgaProperties.librariesScanCron ?: '-'}")
   fun scanAllLibraries() {
     taskReceiver.scanLibraries()
diff --git a/komga/src/main/resources/application-dev.yml b/komga/src/main/resources/application-dev.yml
index 6ecbcad82..22daa8e30 100644
--- a/komga/src/main/resources/application-dev.yml
+++ b/komga/src/main/resources/application-dev.yml
@@ -1,12 +1,11 @@
 komga:
-  threads:
-    analyzer: 1
   filesystem-scanner-force-directory-modified-time: false
   remember-me:
     key: changeMe!
     validity: 2592000 # 1 month
   #  libraries-scan-cron: "*/5 * * * * ?" #every 5 seconds
   libraries-scan-cron: "-" #disable
+  libraries-scan-startup: true
 spring:
   datasource:
     url: jdbc:h2:mem:testdb