diff --git a/image_analysis/IndexAndRefine.cpp b/image_analysis/IndexAndRefine.cpp
index 3f80d0e4..85564ffd 100644
--- a/image_analysis/IndexAndRefine.cpp
+++ b/image_analysis/IndexAndRefine.cpp
@@ -28,7 +28,7 @@ void IndexAndRefine::ProcessImage(DataMessage &msg,
                                   const SpotFindingSettings &spot_finding_settings,
                                   const CompressedImage &image,
                                   BraggPrediction &prediction) {
-    if (!indexer_)
+    if (!indexer_ || !spot_finding_settings.indexing)
         return;
 
     msg.indexing_result = false;