diff --git a/webservice/webservice.py b/webservice/webservice.py
index 2606a9d672b5eb2c476886432200a100f16b82e5..135332fef9677518465f531ec4e588ea384f7993 100644
--- a/webservice/webservice.py
+++ b/webservice/webservice.py
@@ -573,19 +573,13 @@ async def server_runner(config, mode):
                 out_folder = config[action]['out-folder'].format(
                     instrument=instrument, cycle=cycle, proposal=proposal,
                     runs="_".join(wait_runs))
+
                 for runnr in wait_runs:
                     rpath = "{}/r{:04d}/".format(in_folder, int(runnr))
-                    if len(detectors) == 0:
-                        logging.warn(Errors.NOTHING_TO_DO.format(rpath))
-                        msg = "Nothing to characterize for these runs"
-                        response = mdc.update_run_api(rid, {
-                            'flg_cal_data_status': 'NA',
-                            'cal_pipeline_reply': msg})
-                        if response.status_code != 200:
-                            logging.error(Errors.MDC_RESPONSE.format(response))
 
                     for detector, dconfig in pconf[instrument].items():
-                        # check if we find files according to mapping in raw run folder
+                        # check if we find files according
+                        # to mapping in raw run folder
                         fl = glob.glob(
                             "{}/RAW-*{}*.h5".format(rpath, dconfig["inset"]))
                         if len(fl):
@@ -595,9 +589,20 @@ async def server_runner(config, mode):
                             thisconf["in-folder"] = in_folder
                             thisconf["out-folder"] = out_folder
 
-                            del thisconf[
-                                "inset"]  # don't need this for xfel-calibrate
+                            # don't need this for xfel-calibrate
+                            del thisconf["inset"]
+
                             detectors[detector] = thisconf
+
+                    if len(detectors) == 0:
+                        logging.warn(Errors.NOTHING_TO_DO.format(rpath))
+                        msg = "Nothing to characterize for these runs"
+                        response = mdc.update_run_api(rid, {
+                            'flg_cal_data_status': 'NA',
+                            'cal_pipeline_reply': msg})
+                        if response.status_code != 200:
+                            logging.error(Errors.MDC_RESPONSE.format(response))
+
                 print("Detectors:", detectors)
                 for detector, dconfig in detectors.items():
                     if "-" in detector: