diff --git a/lib_com/options.h b/lib_com/options.h
index b38e1d635feb550357d3e60f9883f5983099b3d1..f974f4b8ae1c281f4c474e6f0197fd9577a7db15 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -101,6 +101,7 @@
 #define FIX_BASOP_2332_ASAN_OVERFLOW_IN_EXT_DIRAC_REND  /* Nokia: basop issue 2332: Uses predefined memory sizes instead computing wrong */
 #define FIX_BASOP_2333_MCMASA_ANA_MEMORY_LEAK           /* Nokia: basop issue 2333: Add missing free for direction_vector_e to ivas_mcmasa_ana_fx.c */
 #define HARM_COREDECODER_FUNCTIONS                      /* VA: basop issue 2347: Remove various duplicated code in core-decoder  */
+#define FIX_2331_CLANG18_MSAN_UNINIT_VARIABLE           /* FhG: Fix issue 2331: Uninitialized variable */
 
 /* #################### End BE switches ################################## */
 
diff --git a/lib_rend/lib_rend_fx.c b/lib_rend/lib_rend_fx.c
index 67b72c0301c67a5751a70522caf4894b6c60574c..a27b9c9c2abf6720c8b68e9725e0894e6555c185 100644
--- a/lib_rend/lib_rend_fx.c
+++ b/lib_rend/lib_rend_fx.c
@@ -6928,6 +6928,10 @@ static ivas_error renderIsmToSba(
     error = IVAS_ERR_OK;
     move32();
 
+#ifdef FIX_2331_CLANG18_MSAN_UNINIT_VARIABLE
+    set32_fx( currentPanGains_fx, 0, MAX_OUTPUT_CHANNELS );
+#endif
+
     ismInput->currentPos.azimuth_fx = L_shl( L_shr( L_add( ismInput->currentPos.azimuth_fx, ONE_IN_Q21 ), Q22 ), Q22 );
     ismInput->currentPos.elevation_fx = L_shl( L_shr( L_add( ismInput->currentPos.elevation_fx, ONE_IN_Q21 ), Q22 ), Q22 );
     ismInput->previousPos.azimuth_fx = L_shl( L_shr( L_add( ismInput->previousPos.azimuth_fx, ONE_IN_Q21 ), Q22 ), Q22 );