diff --git a/lib_com/options.h b/lib_com/options.h
index f7a92edbc9f0274d6858f668d16e8a072d744dab..64e3bac9fa6be225fcff62ffb475e3bc6ea3333c 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -103,8 +103,8 @@
 #define FIX_BASOP_2612_RESET_DECIM_MEM                  /* FhG: BASOP #2612: reset (zero) the 16k resampler memory of the secondary channel on DFT->TD stereo switch (otherwise -> fx overshoot) */
 #define FIX_BASOP_2621_STEREO_CNG_NOISY_SPEECH_QSHIFT   /* FhG: BASOP #2621: stereo_dft_generate_comfort_noise_fx flag_noisy_speech: compare (lp_speech-lp_noise) Q23 diff against 28.0 in Q23 (was vs integer 28 with q_lp_noise=0) */
 #define FIX_ISSUE_2618_PLC_RES_ATT_SCALING              /* FhG: BASOP #2618: residual PLC burst attenuation, apply divide/Sqrt32 exponent so fac tracks exponent correctly */
-
-#define NONBE_FIX2614_LP_CNG_ASSERT
+#define NONBE_FIX2614_LP_CNG_ASSERT                     /* FhG: */
+#define FIX_FLOAT_1600_OMASA_WRONG_RENDER_PATH          /* Nokia: float issue 1600: fix initialization condition of stereo type detection for OMASA */
 
 /* ##################### End NON-BE switches ########################### */
 
diff --git a/lib_dec/ivas_dirac_dec_fx.c b/lib_dec/ivas_dirac_dec_fx.c
index ecde2403fbd8e8e1b72309ae6bc97c226d5ab020..3ec355f752bf196defb54942ffa99c49e490314c 100644
--- a/lib_dec/ivas_dirac_dec_fx.c
+++ b/lib_dec/ivas_dirac_dec_fx.c
@@ -353,7 +353,12 @@ static ivas_error ivas_dirac_rend_config_fx(
     test();
     test();
     test();
+#ifdef FIX_FLOAT_1600_OMASA_WRONG_RENDER_PATH
+    test();
+    IF( ( EQ_16( st_ivas->ivas_format, MASA_FORMAT ) || EQ_16( st_ivas->ivas_format, MASA_ISM_FORMAT ) || EQ_16( st_ivas->mc_mode, MC_MODE_MCMASA ) ) && EQ_16( hDirACRend->panningConf, DIRAC_PANNING_HOA3 ) && EQ_16( nchan_transport, 2 ) )
+#else
     IF( ( EQ_16( st_ivas->ivas_format, MASA_FORMAT ) || EQ_16( st_ivas->mc_mode, MC_MODE_MCMASA ) ) && EQ_16( hDirACRend->panningConf, DIRAC_PANNING_HOA3 ) && EQ_16( nchan_transport, 2 ) )
+#endif
     {
         test();
         test();