diff --git a/lib_dec/ivas_dirac_dec_fx.c b/lib_dec/ivas_dirac_dec_fx.c
index f29133d92d44df958772cc43fddb31ffdc8538c6..03bc7ee12ee45d2cc81066fc65c158f191c6aa25 100644
--- a/lib_dec/ivas_dirac_dec_fx.c
+++ b/lib_dec/ivas_dirac_dec_fx.c
@@ -2217,27 +2217,6 @@ void ivas_dirac_dec_render_sf_fx(
     move16();
     move16();
 
-
-    FOR( i = 0; i < MAX_OUTPUT_CHANNELS; i++ )
-    {
-        FOR( Word16 j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ )
-        {
-            set32_fx( Cldfb_RealBuffer_fx[i][j], 0, CLDFB_NO_CHANNELS_MAX );
-            set32_fx( Cldfb_ImagBuffer_fx[i][j], 0, CLDFB_NO_CHANNELS_MAX );
-        }
-    }
-
-#ifndef OPT_BIN_RENDERER_V2
-    FOR( i = 0; i < BINAURAL_CHANNELS; i++ )
-    {
-        FOR( Word16 j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ )
-        {
-            set32_fx( Cldfb_RealBuffer_Binaural_fx[i][j], 0, CLDFB_NO_CHANNELS_MAX );
-            set32_fx( Cldfb_RealBuffer_Binaural_fx[i][j], 0, CLDFB_NO_CHANNELS_MAX );
-        }
-    }
-#endif /* OPT_BIN_RENDERER_V2 */
-
     /* local copies of azi, ele, diffuseness */
     Word16 azimuth[CLDFB_NO_CHANNELS_MAX];
     Word16 elevation[CLDFB_NO_CHANNELS_MAX];
@@ -2288,6 +2267,27 @@ void ivas_dirac_dec_render_sf_fx(
     push_wmops( "ivas_dirac_dec_render" );
 
     /* Initialize aux buffers */
+
+    FOR( i = 0; i < MAX_OUTPUT_CHANNELS; i++ )
+    {
+        FOR( Word16 j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ )
+        {
+            set32_fx( Cldfb_RealBuffer_fx[i][j], 0, CLDFB_NO_CHANNELS_MAX );
+            set32_fx( Cldfb_ImagBuffer_fx[i][j], 0, CLDFB_NO_CHANNELS_MAX );
+        }
+    }
+
+#ifndef OPT_BIN_RENDERER_V2
+    FOR( i = 0; i < BINAURAL_CHANNELS; i++ )
+    {
+        FOR( Word16 j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ )
+        {
+            set32_fx( Cldfb_RealBuffer_Binaural_fx[i][j], 0, CLDFB_NO_CHANNELS_MAX );
+            set32_fx( Cldfb_ImagBuffer_Binaural_fx[i][j], 0, CLDFB_NO_CHANNELS_MAX );
+        }
+    }
+#endif /* OPT_BIN_RENDERER_V2 */
+
     hDirAC = st_ivas->hDirAC;
     hDirACRend = st_ivas->hDirACRend;
     hSpatParamRendCom = st_ivas->hSpatParamRendCom;