diff --git a/image_analysis/RotationIndexer.cpp b/image_analysis/RotationIndexer.cpp
index ab957426..df4d09f1 100644
--- a/image_analysis/RotationIndexer.cpp
+++ b/image_analysis/RotationIndexer.cpp
@@ -23,8 +23,8 @@ RotationIndexer::RotationIndexer(const DiffractionExperiment &x, IndexerThreadPo
         } else {
             if (x.GetImageNum() < min_images_for_indexing) {
                 // For short measurements - only indexing at the end
-                first_image_to_try_indexing = INT64_MAX;
-                next_image_to_try_indexing = INT64_MAX;
+                first_image_to_try_indexing = std::max<int64_t>(0, x.GetImageNum() - 1);
+                next_image_to_try_indexing = first_image_to_try_indexing;
                 image_stride = 1;
             } else {
                 first_image_to_try_indexing = std::max<int64_t>(min_images_for_indexing,
@@ -137,7 +137,12 @@ std::optional<RotationIndexerResult> RotationIndexer::ProcessImage(int64_t image
         accumulated_images++;
         last_accumulated_image = image;
 
-        if (accumulated_images >= min_images_for_indexing && image >= next_image_to_try_indexing)
+        const bool short_scan_last_image =
+            (experiment.GetImageNum() < min_images_for_indexing) &&
+            (image >= experiment.GetImageNum() - 1);
+
+        if ((accumulated_images >= min_images_for_indexing || short_scan_last_image) &&
+            image >= next_image_to_try_indexing)
             TryIndex();
     }
     if (!indexed_lattice)
diff --git a/tests/RotationIndexerTest.cpp b/tests/RotationIndexerTest.cpp
index 45b561a5..2b4ea0e3 100644
--- a/tests/RotationIndexerTest.cpp
+++ b/tests/RotationIndexerTest.cpp
@@ -89,3 +89,101 @@ TEST_CASE("RotationIndexer") {
     CHECK(ret->search_result.centering == 'P');
     CHECK(ret->search_result.system == gemmi::CrystalSystem::Orthorhombic);
 }
+
+TEST_CASE("RotationIndexer short scan indexes only at the end") {
+    DiffractionExperiment exp_i;
+    exp_i.IncidentEnergy_keV(WVL_1A_IN_KEV)
+         .BeamX_pxl(1000)
+         .BeamY_pxl(1000)
+         .PoniRot1_rad(0.01)
+         .PoniRot2_rad(0.02)
+         .DetectorDistance_mm(200)
+         .ImagesPerTrigger(6);
+
+    IndexingSettings settings;
+#ifdef JFJOCH_USE_CUDA
+    settings.Algorithm(IndexingAlgorithmEnum::FFT);
+#elif JFJOCH_USE_FFTW
+    settings.Algorithm(IndexingAlgorithmEnum::FFTW);
+#else
+    return;
+#endif
+
+    settings.RotationIndexing(true).RotationIndexingAngularStride_deg(1.0).RotationIndexingMinAngularRange_deg(30.0);
+    exp_i.ImportIndexingSettings(settings);
+
+    CrystalLattice latt_base(40, 50, 80, 90, 90, 90);
+    latt_base = latt_base.Multiply(RotMatrix(2.0, Coord(sqrt(3)/3,sqrt(3)/3,sqrt(3)/3)));
+
+    GoniometerAxis axis("omega", 0.0f, 30.0f, Coord(1,0,0), std::nullopt);
+    exp_i.Goniometer(axis);
+
+    BraggPredictionSettings prediction_settings{
+        .high_res_A = 1.3,
+        .ewald_dist_cutoff = 0.002
+    };
+
+    IndexerThreadPool indexer_thread_pool(exp_i.GetIndexingSettings());
+    RotationIndexer indexer(exp_i, indexer_thread_pool);
+
+    BraggPrediction prediction;
+
+    for (int img = 0; img < 5; ++img) {
+        std::vector<SpotToSave> spots;
+        const float angle_deg = axis.GetAngle_deg(img) + axis.GetWedge_deg() / 2.0f;
+        const RotMatrix rot = axis.GetTransformationAngle(angle_deg);
+        const CrystalLattice latt_img = latt_base.Multiply(rot.transpose());
+
+        const auto n = prediction.Calc(exp_i, latt_img, prediction_settings);
+        for (int i = 0; i < n; ++i) {
+            const auto& r = prediction.GetReflections().at(i);
+            SpotToSave s{};
+            s.x = r.predicted_x;
+            s.y = r.predicted_y;
+            s.image = img;
+            s.intensity = 1.0f;
+            s.phi = angle_deg;
+            s.ice_ring = false;
+            s.indexed = true;
+            spots.push_back(s);
+        }
+
+        CHECK_FALSE(indexer.ProcessImage(img, spots).has_value());
+    }
+
+    std::vector<SpotToSave> last_spots;
+    const int last_img = 5;
+    const float angle_deg = axis.GetAngle_deg(last_img) + axis.GetWedge_deg() / 2.0f;
+    const RotMatrix rot = axis.GetTransformationAngle(angle_deg);
+    const CrystalLattice latt_img = latt_base.Multiply(rot.transpose());
+
+    const auto n = prediction.Calc(exp_i, latt_img, prediction_settings);
+    for (int i = 0; i < n; ++i) {
+        const auto& r = prediction.GetReflections().at(i);
+        SpotToSave s{};
+        s.x = r.predicted_x;
+        s.y = r.predicted_y;
+        s.image = last_img;
+        s.intensity = 1.0f;
+        s.phi = angle_deg;
+        s.ice_ring = false;
+        s.indexed = true;
+        last_spots.push_back(s);
+    }
+
+    auto ret_last = indexer.ProcessImage(last_img, last_spots);
+    REQUIRE(ret_last.has_value());
+
+    auto ret = indexer.GetLattice();
+    REQUIRE(ret.has_value());
+    auto uc = ret->lattice.GetUnitCell();
+    auto uc_ref = latt_base.GetUnitCell();
+    REQUIRE(std::fabs(uc.a - uc_ref.a) < 0.02 );
+    REQUIRE(std::fabs(uc.b - uc_ref.b) < 0.02 );
+    REQUIRE(std::fabs(uc.c - uc_ref.c) < 0.02 );
+    REQUIRE(std::fabs(uc.alpha - uc_ref.alpha) < 0.1);
+    REQUIRE(std::fabs(uc.beta - uc_ref.beta) < 0.1);
+    REQUIRE(std::fabs(uc.gamma - uc_ref.gamma) < 0.1);
+    CHECK(ret->search_result.centering == 'P');
+    CHECK(ret->search_result.system == gemmi::CrystalSystem::Orthorhombic);
+}
\ No newline at end of file