diff --git a/src/cal_tools/calcat_interface.py b/src/cal_tools/calcat_interface.py
index 03f3d1437d28a423ee447f370550d5c0df70e9b1..22db045d07ae866ce0c8405b32f8ef6b7dbb5baa 100644
--- a/src/cal_tools/calcat_interface.py
+++ b/src/cal_tools/calcat_interface.py
@@ -178,7 +178,6 @@ class CalCatApi(metaclass=ClientWrapper):
         else:
             raise ValueError(f"{module_naming} is unknown!")
 
-
     @lru_cache()
     def calibration_id(self, calibration_name):
         """ID for a calibration in CalCat."""
@@ -1035,10 +1034,13 @@ class AGIPD_CalibrationData(SplitConditionCalibrationData):
 
     def _build_condition(self, parameters):
         cond = super()._build_condition(parameters)
-
         # Fix-up some database quirks.
-        if int(cond.get("Gain mode", -1)) == 0:
+        gain_mode = cond.get("Gain mode", None)
+
+        if gain_mode is not None and int(gain_mode) == 0:
             del cond["Gain mode"]
+        elif gain_mode is not None:
+            cond["Gain mode"] = 1
 
         if int(cond.get("Integration time", -1)) == 12:
             del cond["Integration time"]