diff --git a/receiver/JFJochReceiverPlots.cpp b/receiver/JFJochReceiverPlots.cpp
index 987d1015..f084a098 100644
--- a/receiver/JFJochReceiverPlots.cpp
+++ b/receiver/JFJochReceiverPlots.cpp
@@ -167,8 +167,12 @@ void JFJochReceiverPlots::Add(const DataMessage &msg, const AzimuthalIntegration
         indexing_uc_beta.AddElement(msg.number, msg.indexing_unit_cell->beta);
         indexing_uc_gamma.AddElement(msg.number, msg.indexing_unit_cell->gamma);
     }
-
-    indexing_lattice_count.AddElement(msg.number, msg.indexing_extra_lattices.size());
+    if (msg.indexing_result.has_value()) {
+        if (!msg.indexing_result.value())
+            indexing_lattice_count.AddElement(msg.number, 0);
+        else
+            indexing_lattice_count.AddElement(msg.number, msg.indexing_extra_lattices.size());
+    }
     beam_center_x.AddElement(msg.number, msg.beam_corr_x);
     beam_center_y.AddElement(msg.number, msg.beam_corr_y);