diff --git a/lib_com/options.h b/lib_com/options.h
index bd32adb35e951beb5cf97bea71432c67ad3da5f6..acd7332ccee27af1993defd24d437611ecb08998 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -120,6 +120,7 @@
 #define FIX_2356_GET_CHAN_ENERGIES                      /* FhG: basop issue 2356: correctly initialize exponents in getChannelEnergies_fx() */
 #define FIX_2355_IGF_EXP_POWERSPEC                      /* FhG: basop issue 2355: make sure exp_pPowerSpectrumParameter_fx is initialized in all cases */
 #define FIX_2319_CLDFB_INIT_FLAGS                       /* FhG: basop issue 2319: init hs->flags during openCldfb(), to avoid reading of uninitialized memory */
+#define FIX_BASOP_2357_OBJECT_EDIT_MSAN                 /* Nokia: basop issue 2357: initialize missing exponents in object edit */
 
 /* #################### End BE switches ################################## */
 
diff --git a/lib_dec/ivas_omasa_dec_fx.c b/lib_dec/ivas_omasa_dec_fx.c
index f06e1ec8547cd9dbba6335532a4f63bd8bcf2c43..1659d4912e8663b43bcfb540f131c9fb1c64c7d9 100644
--- a/lib_dec/ivas_omasa_dec_fx.c
+++ b/lib_dec/ivas_omasa_dec_fx.c
@@ -344,8 +344,16 @@ ivas_error ivas_omasa_data_open_fx(
         move16();
         hMasaIsmData->preprocEneTarget_fx[band_idx] = 0;
         move32();
+#ifdef FIX_BASOP_2357_OBJECT_EDIT_MSAN
+        hMasaIsmData->preprocEneTarget_e[band_idx] = 0;
+        move16();
+#endif
         hMasaIsmData->preprocEneRealized_fx[band_idx] = 0;
         move32();
+#ifdef FIX_BASOP_2357_OBJECT_EDIT_MSAN
+        hMasaIsmData->preprocEneRealized_e[band_idx] = 0;
+        move16();
+#endif
     }
 
     hMasaIsmData->objectsEdited = 0;