diff --git a/src/calng/AgipdCorrection.py b/src/calng/AgipdCorrection.py
index 4d56de0c8f79cd894e5d567367bf2efb58c68423..36edc80d124a71e09aeaab51454b656bc42888bc 100644
--- a/src/calng/AgipdCorrection.py
+++ b/src/calng/AgipdCorrection.py
@@ -425,6 +425,14 @@ class AgipdCalcatFriend(calcat_utils.BaseCalcatFriend):
 
     def illuminated_condition(self):
         res = self.dark_condition()
+
+        # note: can consider always setting memory cells to 352 for FF
+        # (deviation on constants in database should remove need for this, though)
+
+        # for now, FF constants don't care about gain mode
+        if "Gain Mode" in res:
+            del res["Gain Mode"]
+
         res["Source Energy"] = self._get_param("photonEnergy")
 
         return res