diff --git a/lib_com/options.h b/lib_com/options.h
index ba038886cb25820afb3b26b4606ea76d07c5c034..8c881f81294bf6e3de0515d36c61e9b036df9775 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -111,6 +111,7 @@
 #define FIX_BASOP_2324_MISSING_SET_TO_ZERO              /* Nokia: basop issue 2324: Fix issue by setting the exponent to zero where it should be */
 #define FIX_BASOP_2326_WRONG_SIG_LENGTH                 /* Nokia: basop issue 2326: Fix issue by using correct signal length in multiple places */
 #define FIX_BASOP_2327_WRONG_LOOP_END                   /* Nokia: basop inssue 2327: Correct loop end to solve MSAN error */
+#define FIX_BASOP_2328_MSAN_WRONG_ASSIGNMENT            /* Nokia: basop issue 2328: Fix MSAN error by correcting the variable assignment */
 
 /* #################### End BE switches ################################## */
 
diff --git a/lib_rend/ivas_dirac_output_synthesis_dec_fx.c b/lib_rend/ivas_dirac_output_synthesis_dec_fx.c
index 5372c3830e769165adf4f8c84d70a7b2fe892e9b..7121cbe2c300d2120eded6de3e72be89f069dd69 100644
--- a/lib_rend/ivas_dirac_output_synthesis_dec_fx.c
+++ b/lib_rend/ivas_dirac_output_synthesis_dec_fx.c
@@ -211,7 +211,11 @@ ivas_error ivas_dirac_dec_output_synthesis_open_fx(
         {
             return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
         }
+#ifdef FIX_BASOP_2328_MSAN_WRONG_ASSIGNMENT
+        dirac_output_synthesis_state->cy_auto_diff_smooth_prev_len = imult1616( dirac_output_synthesis_params->max_band_decorr, hDirACRend->num_outputs_diff );
+#else
         dirac_output_synthesis_state->cy_auto_dir_smooth_prev_len = imult1616( dirac_output_synthesis_params->max_band_decorr, hDirACRend->num_outputs_diff );
+#endif
         move16();
     }
     ELSE