diff --git a/lib_com/options.h b/lib_com/options.h
index 13a0c786d3b9024c0eab4248878420b63eb996ce..22ba0160eb49c73c4199280c229f997123c1861d 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -162,6 +162,7 @@
 #define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */
 #define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */
 #define FIX_FLOAT_1535_ARI_RES_Q_CLEANUP                /* FhG: remove dead code from tcx_ari_res_Q_spec() */
+#define FIX_FLOAT_1536_INIT_NO_PARAM_LPC                /* FhG: make sure no_param_lpc is initialized in core_encode_twodiv() */
 
 /* #################### End BE switches ################################## */
 
diff --git a/lib_enc/core_enc_2div.c b/lib_enc/core_enc_2div.c
index c46004027807269ccf1695adedf84efe40c42558..08f90e05e272148880f9a9cce0f1a0eb2500232d 100644
--- a/lib_enc/core_enc_2div.c
+++ b/lib_enc/core_enc_2div.c
@@ -83,6 +83,9 @@ void core_encode_twodiv(
     set_s( tnsSize, 0, 2 );
     set_s( tnsBits, 0, 2 );
     ltpBits = 0;
+#ifdef FIX_FLOAT_1536_INIT_NO_PARAM_LPC
+    no_param_lpc = 0;
+#endif
 
     for ( i = 0; i < 3; i++ )
     {