diff --git a/lib_com/options.h b/lib_com/options.h
index acd7332ccee27af1993defd24d437611ecb08998..929c05624b79d078928722c0644ed24cb455ba46 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -121,6 +121,7 @@
 #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 */
+#define FIX_BASOP_2354_MSAN_DIFF_Q_VALUE                /* Nokia: Initialize Q value of diffuseness in rendering to Q30 */
 
 /* #################### End BE switches ################################## */
 
diff --git a/lib_rend/ivas_dirac_rend_fx.c b/lib_rend/ivas_dirac_rend_fx.c
index 7eb2f83d69d4ec0554e06a48e5a924eb73b8d024..e7df45b6cfb4128d2b3c9c2ba6744c8b2bf3af56 100644
--- a/lib_rend/ivas_dirac_rend_fx.c
+++ b/lib_rend/ivas_dirac_rend_fx.c
@@ -253,6 +253,10 @@ ivas_error ivas_spat_hSpatParamRendCom_config_fx(
         move16();
         hSpatParamRendCom->numIsmDirections = 0;
         move16();
+#ifdef FIX_BASOP_2354_MSAN_DIFF_Q_VALUE
+        hSpatParamRendCom->q_diffuseness_vector = Q30;
+        move16();
+#endif
     }
 
     /*-----------------------------------------------------------------*