diff --git a/lib_com/options.h b/lib_com/options.h
index 1b811a39f8e827c291b37ed61c30dac22a645e3f..cc41c23d898d62895593afce2769240b25594e3d 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -107,6 +107,7 @@
 #define FIX_2344_ALIGN_PREPROC                          /* VA: basop issue 2344: Align pre_proc_ivas() between FLP and BASOP */
 #define FIX_2334_HARM_CODER_MODIF                       /* VA: basop issue 2334 : harmonizing coder_modif_function */
 #define FIX_FLOAT_1501_UNIT_VALUE_IN_OMASA              /* Nokia: Fix float issue 1501, uninitialized value in ivas_masa_combine_directions for OMASA */
+#define FIX_BASOP_2323_DIRAC_ENC_WRONG_INIT             /* Nokia/FhG: basop issue 2323: Use correct init size */
 
 /* #################### End BE switches ################################## */
 
diff --git a/lib_enc/ivas_dirac_enc_fx.c b/lib_enc/ivas_dirac_enc_fx.c
index 5e9c82f7a00412fa214172663dc4ecce8dec3b82..7a2823b7a7487516c835d9c37db769f18748005a 100644
--- a/lib_enc/ivas_dirac_enc_fx.c
+++ b/lib_enc/ivas_dirac_enc_fx.c
@@ -1574,9 +1574,17 @@ void computeDiffuseness_mdft_fx(
     set_zero_fx( intensity_slow, i_mult( DIRAC_NUM_DIMS, MASA_FREQUENCY_BANDS ) );
     set16_fx( intensity_slow_e, 0, i_mult( DIRAC_NUM_DIMS, MASA_FREQUENCY_BANDS ) );
     set_zero_fx( intensity_slow_abs, MASA_FREQUENCY_BANDS );
+#ifdef FIX_BASOP_2323_DIRAC_ENC_WRONG_INIT
+    set16_fx( intensity_slow_abs_e, 0, MASA_FREQUENCY_BANDS );
+#else
     set16_fx( intensity_slow_abs_e, 0, no_col_avg_diff );
+#endif
     set_zero_fx( energy_slow, MASA_FREQUENCY_BANDS );
+#ifdef FIX_BASOP_2323_DIRAC_ENC_WRONG_INIT
+    set16_fx( energy_slow_e, 0, MASA_FREQUENCY_BANDS );
+#else
     set16_fx( energy_slow_e, 0, no_col_avg_diff );
+#endif
 
     FOR( i = 0; i < no_col_avg_diff; ++i )
     {