diff --git a/image_analysis/spot_finding/SpotUtils.cpp b/image_analysis/spot_finding/SpotUtils.cpp
index f8e534dd..133510e7 100644
--- a/image_analysis/spot_finding/SpotUtils.cpp
+++ b/image_analysis/spot_finding/SpotUtils.cpp
@@ -49,9 +49,6 @@ void FilterSpotsByCount(std::vector<SpotToSave> &input, int64_t count) {
 }
 
 std::optional<float> GetResolution(const std::vector<SpotToSave> &spots) {
-    if (spots.size() < 6)
-        return std::nullopt;
-
     std::vector<float> resolutions;
     resolutions.reserve(spots.size());
 
@@ -62,7 +59,9 @@ std::optional<float> GetResolution(const std::vector<SpotToSave> &spots) {
 
     std::ranges::sort(resolutions);
 
-    if (spots.size() < 20)
+    if (resolutions.size() < 4)
+        return std::nullopt;
+    if (resolutions.size() < 20)
         return resolutions[2];
     return resolutions[static_cast<size_t>(spots.size() * 0.95)];
 }