diff --git a/src/libs/services/scanner/impl/ScanStepScanFiles.cpp b/src/libs/services/scanner/impl/ScanStepScanFiles.cpp
index 4534918f..a1b25f6b 100644
--- a/src/libs/services/scanner/impl/ScanStepScanFiles.cpp
+++ b/src/libs/services/scanner/impl/ScanStepScanFiles.cpp
@@ -441,7 +441,7 @@ namespace lms::scanner
 
             _metadataScanQueue.wait();
 
-            while (_metadataScanQueue.popResults(scanResults, processMetaDataBatchSize) > 0)
+            while (!_abortScan && _metadataScanQueue.popResults(scanResults, processMetaDataBatchSize) > 0)
                 processMetaDataScanResults(context, scanResults, mediaLibrary);
         }
     }