diff --git a/logic/odmr_logic.py b/logic/odmr_logic.py
index a4bd80011d..7b2f265671 100644
--- a/logic/odmr_logic.py
+++ b/logic/odmr_logic.py
@@ -1146,8 +1146,9 @@ def perform_odmr_measurement(self, freq_start, freq_step, freq_stop, power, chan
 
         # Perform fit if requested
         if fit_function != 'No Fit':
-            self.do_fit(fit_function, channel_index=channel)
-            fit_params = self.fc.current_fit_param
+            for n in range(0, self.ranges):
+                self.do_fit(fit_function, channel_index=channel, fit_range=n)
+                fit_params = self.fc.current_fit_param
         else:
             fit_params = None