diff --git a/server/Server.js b/server/Server.js
index 8d76dd6e..373b7031 100644
--- a/server/Server.js
+++ b/server/Server.js
@@ -334,7 +334,7 @@ class Server {
 
   cancelScan(id) {
     Logger.debug('[Server] Cancel scan', id)
-    this.scanner2.cancelLibraryScan[id] = true
+    this.scanner2.setCancelLibraryScan(id)
   }
 
   // Generates an NFO metadata file, if no audiobookId is passed then all audiobooks are done
diff --git a/server/scanner/Scanner.js b/server/scanner/Scanner.js
index a3203087..40df4eb2 100644
--- a/server/scanner/Scanner.js
+++ b/server/scanner/Scanner.js
@@ -26,7 +26,6 @@ class Scanner {
     this.coverController = coverController
     this.emitter = emitter
 
-    this.cancelScan = false
     this.cancelLibraryScan = {}
     this.librariesScanning = []
 
@@ -51,6 +50,12 @@ class Scanner {
     return this.librariesScanning.find(ls => ls.id === libraryId)
   }
 
+  setCancelLibraryScan(libraryId) {
+    var libraryScanning = this.librariesScanning.find(ls => ls.id === libraryId)
+    if (!libraryScanning) return
+    this.cancelLibraryScan[libraryId] = true
+  }
+
   async scanAudiobookById(audiobookId) {
     var audiobook = this.db.audiobooks.find(ab => ab.id === audiobookId)
     if (!audiobook) {