diff --git a/lib_com/options.h b/lib_com/options.h
index 4aecefb7dc49bca94ba4ad3d08de425a3267676d..7165e2f07145e259da37260baaeab8585abe0332 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -164,6 +164,7 @@
 #define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */
 #define FIX_2344_ALIGN_PREPROC                          /* VA: basop issue 2344: Align pre_proc_ivas() between FLP and BASOP */
 #define FIX_FLOAT_1501_UNIT_VALUE_IN_OMASA              /* Nokia: Fix float issue 1501, uninitialized value in ivas_masa_combine_directions for OMASA */
+#define FIX_2331_CLANG18_MSAN_UNINIT_VARIABLE           /* FhG: Fix issue 2331: Uninitialized variable */
 
 /* #################### End BE switches ################################## */
 
diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c
index 47719baf53b1d8ce8247b52cbc96712bb476335d..b9f9da1ec2e297fdaba2bb6528d37d85707f97a7 100644
--- a/lib_rend/lib_rend.c
+++ b/lib_rend/lib_rend.c
@@ -5996,6 +5996,10 @@ static ivas_error renderIsmToSba(
 
     push_wmops( "renderIsmToSba" );
 
+#ifdef FIX_2331_CLANG18_MSAN_UNINIT_VARIABLE
+    set_zero( currentPanGains, MAX_OUTPUT_CHANNELS );
+#endif
+
     if ( ( error = getAudioConfigNumChannels( outConfig, &numOutChannels ) ) != IVAS_ERR_OK )
     {
         return error;