diff --git a/src/libs/services/scanner/impl/ScannerService.cpp b/src/libs/services/scanner/impl/ScannerService.cpp
index cf48be8d..f29a9b52 100644
--- a/src/libs/services/scanner/impl/ScannerService.cpp
+++ b/src/libs/services/scanner/impl/ScannerService.cpp
@@ -263,11 +263,9 @@ namespace lms::scanner
 
         {
             std::unique_lock lock{ _statusMutex };
-            _curState = State::InProgress;
             _nextScheduledScan = {};
         }
 
-
         LMS_LOG(UI, INFO, "New scan started!");
 
         refreshScanSettings();
@@ -396,6 +394,8 @@ namespace lms::scanner
     {
         {
             std::unique_lock lock{ _statusMutex };
+
+            _curState = State::InProgress;
             _currentScanStepStats = stepStats;
         }
 
diff --git a/src/lms/ui/admin/ScannerController.cpp b/src/lms/ui/admin/ScannerController.cpp
index 8fcb8501..467504ec 100644
--- a/src/lms/ui/admin/ScannerController.cpp
+++ b/src/lms/ui/admin/ScannerController.cpp
@@ -249,6 +249,8 @@ namespace lms::ui
             break;
 
         case IScannerService::State::InProgress:
+            assert(status.currentScanStepStats);
+
             _status->setText(Wt::WString::tr("Lms.Admin.ScannerController.status-in-progress")
                 .arg(status.currentScanStepStats->stepIndex + 1)
                 .arg(scanner::ScanProgressStepCount));