diff --git a/src/libs/services/scanner/impl/ScanStepScanFiles.cpp b/src/libs/services/scanner/impl/ScanStepScanFiles.cpp
index 3513ca78..c2fad403 100644
--- a/src/libs/services/scanner/impl/ScanStepScanFiles.cpp
+++ b/src/libs/services/scanner/impl/ScanStepScanFiles.cpp
@@ -368,7 +368,7 @@ namespace lms::scanner
                         _progressCallback(context.currentStepStats);
                     }
 
-                    while (_metadataScanQueue.getResultsCount() > processMetaDataBatchSize)
+                    while (_metadataScanQueue.getResultsCount() > (scanQueueMaxScanRequestCount / 2))
                     {
                         _metadataScanQueue.popResults(scanResults, processMetaDataBatchSize);
                         processMetaDataScanResults(context, scanResults, mediaLibrary);