diff --git a/image_analysis/ImageAnalysisCPU.cpp b/image_analysis/ImageAnalysisCPU.cpp
index 79d1f164..400b8567 100644
--- a/image_analysis/ImageAnalysisCPU.cpp
+++ b/image_analysis/ImageAnalysisCPU.cpp
@@ -141,13 +141,13 @@ void ImageAnalysisCPU::Analyze(DataMessage &output,
         }
     }
 
-    std::vector<DiffractionSpot> spots;
-    if (spot_finding_settings.enable)
-        spots = spotFinder.Run(image, spot_finding_settings);
+    if (spot_finding_settings.enable) {
+        std::vector<DiffractionSpot> spots = spotFinder.Run(image, spot_finding_settings);
 
-    SpotAnalyze(experiment, spot_finding_settings, spots,
-                CompressedImage(updated_image, experiment.GetXPixelsNum(), experiment.GetYPixelsNum()),
-                indexer, output);
+        SpotAnalyze(experiment, spot_finding_settings, spots,
+                    CompressedImage(updated_image, experiment.GetXPixelsNum(), experiment.GetYPixelsNum()),
+                    indexer, output);
+    }
 
     profile.Add(azim_sum, azim_count);