diff --git a/src/calng/AgipdCorrection.py b/src/calng/AgipdCorrection.py
index d54f984d950db06cc79bd56c5de50cb74461d8ae..02cea77b12b81e038e770ffa8b101a60bdcecc02 100644
--- a/src/calng/AgipdCorrection.py
+++ b/src/calng/AgipdCorrection.py
@@ -39,6 +39,7 @@ class AgipdCorrection(BaseCorrection):
     @staticmethod
     def expectedParameters(expected):
         super(AgipdCorrection, AgipdCorrection).expectedParameters(expected)
+        expected.setDefaultValue("dataFormat.memoryCells", 352)
         (
             STRING_ELEMENT(expected)
             .key("gainMode")
diff --git a/src/calng/DsscCorrection.py b/src/calng/DsscCorrection.py
index 1687328cd0ebacaac0e7e1ea41ae1d09784da504..3c5b8f181fcb9f54cc9b81373ca9d732d29bb181 100644
--- a/src/calng/DsscCorrection.py
+++ b/src/calng/DsscCorrection.py
@@ -23,6 +23,7 @@ class DsscCorrection(BaseCorrection):
     @staticmethod
     def expectedParameters(expected):
         super(DsscCorrection, DsscCorrection).expectedParameters(expected)
+        expected.setDefaultValue("dataFormat.memoryCells", 400)
         DsscCalcatFriend.add_schema(expected)
         add_correction_step_schema(expected, DsscCorrection._correction_field_names)
 
diff --git a/src/calng/base_correction.py b/src/calng/base_correction.py
index 8d22d024830c05f742a4c00df5851a1b6126fe0f..c3b608adb03658a6d97bc413bd25c56838036fa2 100644
--- a/src/calng/base_correction.py
+++ b/src/calng/base_correction.py
@@ -160,7 +160,7 @@ class BaseCorrection(PythonDevice):
             .displayedName("Memory cells")
             .description("Full number of memory cells in incoming data")
             .assignmentOptional()
-            .defaultValue(352)
+            .noDefaultValue()
             .commit(),
             STRING_ELEMENT(expected)
             .key("dataFormat.outputAxisOrder")
diff --git a/src/calng/calcat_utils.py b/src/calng/calcat_utils.py
index 2943b05f6d29c854f377113fef12f32838e0465b..577d526e59ee92f7170859ccfdee727cc82ba011 100644
--- a/src/calng/calcat_utils.py
+++ b/src/calng/calcat_utils.py
@@ -187,7 +187,7 @@ class BaseCalcatFriend:
             UINT32_ELEMENT(schema)
             .key(f"{param_prefix}.memoryCells")
             .assignmentOptional()
-            .defaultValue(352)
+            .noDefaultValue()
             .reconfigurable()
             .commit(),
             UINT32_ELEMENT(schema)
@@ -418,6 +418,7 @@ class AgipdCalcatFriend(BaseCalcatFriend):
         super(AgipdCalcatFriend, AgipdCalcatFriend).add_schema(
             schema, "AGIPD-Type", param_prefix, status_prefix
         )
+        schema.setDefaultValue(f"{param_prefix}.memoryCells", 352)
 
         (
             DOUBLE_ELEMENT(schema)
@@ -495,6 +496,7 @@ class DsscCalcatFriend(BaseCalcatFriend):
         super(DsscCalcatFriend, DsscCalcatFriend).add_schema(
             schema, "DSSC-Type", param_prefix, status_prefix
         )
+        schema.setDefaultValue(f"{param_prefix}.memoryCells", 400)
         (
             DOUBLE_ELEMENT(schema)
             .key(f"{param_prefix}.pulseIdChecksum")