diff --git a/lib_com/options.h b/lib_com/options.h
index 8c881f81294bf6e3de0515d36c61e9b036df9775..8ede9e10c113e8f8a17e80ad72722ea365133aa9 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -112,6 +112,7 @@
 #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 */
+#define FIX_BASOP_2329_UNINIT_VALUE                     /* Nokia: basop issue 2329: Fix issue by checking for structure instead of length */
 
 /* #################### End BE switches ################################## */
 
diff --git a/lib_rend/ivas_dirac_rend_fx.c b/lib_rend/ivas_dirac_rend_fx.c
index 6c2f9781e2c9b080c52c8ae130f8b7d4e2d0a528..7eb2f83d69d4ec0554e06a48e5a924eb73b8d024 100644
--- a/lib_rend/ivas_dirac_rend_fx.c
+++ b/lib_rend/ivas_dirac_rend_fx.c
@@ -856,6 +856,11 @@ ivas_error ivas_dirac_alloc_mem_fx(
     /* Prototypes */
     hDirAC_mem->proto_direct_buffer_f_fx = NULL;
     hDirAC_mem->proto_diffuse_buffer_f_fx = NULL;
+#ifdef FIX_BASOP_2329_UNINIT_VALUE
+    hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_len = 0;
+    hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_len = 0;
+    hDirAC_mem->proto_diffuse_buffer_f_len = 0;
+#endif
     test();
     test();
     IF( NE_32( renderer_type, RENDERER_BINAURAL_PARAMETRIC ) && NE_32( renderer_type, RENDERER_BINAURAL_PARAMETRIC_ROOM ) && NE_32( renderer_type, RENDERER_STEREO_PARAMETRIC ) )
diff --git a/lib_rend/lib_rend_fx.c b/lib_rend/lib_rend_fx.c
index 540838f86a19c30f2ffdb51e5e0842ffd3a6713c..168e33f7467e8529e6f7efba7190d06defffd03b 100644
--- a/lib_rend/lib_rend_fx.c
+++ b/lib_rend/lib_rend_fx.c
@@ -11206,7 +11206,11 @@ static void intermidiate_ext_dirac_render(
             move16();
         }
 
+#ifdef FIX_BASOP_2329_UNINIT_VALUE
+        IF( hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_fx )
+#else
         IF( hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_len > 0 )
+#endif
         {
             Word16 shift, norm1, norm2;
             Word32 tmp1, tmp2;