diff --git a/dap/algos/streakfind.py b/dap/algos/streakfind.py
index 04b7372..98ca4e2 100644
--- a/dap/algos/streakfind.py
+++ b/dap/algos/streakfind.py
@@ -128,6 +128,10 @@ def _calc_streakfinder_analysis(results, cryst_data: CrystData):
     peaks = det_obj.detect_peaks(peak_vmin, npts, peaks_structure, num_threads)
     detected = det_obj.detect_streaks(peaks, xtol, streak_vmin, min_size, nfa=nfa,
                                       num_threads=num_threads)
+
+    if isinstance(detected, list):
+        detected = detected[0]
+
     if not detected.streaks:
         results.update({"number_of_streaks": 0})
         results.update({"is_hit_frame": False})
@@ -136,9 +140,6 @@ def _calc_streakfinder_analysis(results, cryst_data: CrystData):
         results.update({"bragg_counts": []})
         return
 
-    if isinstance(detected, list):
-        detected = detected[0]
-
     streaks = det_obj.to_streaks(detected)
 
     if x_center is not None and y_center is not None: