diff --git a/APPL/MLD/mld_edit_melding_save.asp b/APPL/MLD/mld_edit_melding_save.asp
index 3df7692812..8bf1e0cf85 100644
--- a/APPL/MLD/mld_edit_melding_save.asp
+++ b/APPL/MLD/mld_edit_melding_save.asp
@@ -537,19 +537,23 @@ if (savemode)
                       + " WHERE m.mld_srtkenmerk_key = t.mld_srtkenmerk_key"
                       + "   AND m.mld_kenmerk_key = "; /* wordt in saveFlexkenmerken uitgebreid */
 
-  var flextrack =
-      saveFlexKenmerken(mld_key, { kenmerkTable: "mld_kenmerkmelding",
-                                   kenmerkParentKey : "mld_melding_key",
-                                   kenmerkWaarde: "mld_kenmerkmelding_waarde",
-                                   kenmerkKey: "mld_kenmerk_key",
-                                   currentKenmerkenSQL: currentKenmerkenSQL,
-                                   allKenmerkenSQL: allKenmerkenSQL,
-                                   requestQF: Request.Form,
-                                   isNew: isNew,
-                                   flexPath: "MLD/M",
-                                   tracking: true,
-                                   module: "MLD"
-                              });
+  var flextrack = [];
+  if (isNew || this_mld.canFlexChange) // anders veel te riskant (FSN#38017)
+  {
+      var flextrack =
+          saveFlexKenmerken(mld_key, { kenmerkTable: "mld_kenmerkmelding",
+                                       kenmerkParentKey : "mld_melding_key",
+                                       kenmerkWaarde: "mld_kenmerkmelding_waarde",
+                                       kenmerkKey: "mld_kenmerk_key",
+                                       currentKenmerkenSQL: currentKenmerkenSQL,
+                                       allKenmerkenSQL: allKenmerkenSQL,
+                                       requestQF: Request.Form,
+                                       isNew: isNew,
+                                       flexPath: "MLD/M",
+                                       tracking: true,
+                                       module: "MLD"
+                                  });
+  }
 
   var doneParams = { mld_key : mld_key, autoprint: false, warning: "", autoorder: autoorder, success: true };