diff --git a/lib_com/options.h b/lib_com/options.h
index bf949b6e2de334329d8bba4670218957d3603aa3..4206fedaa698394821ee003dd10cc8e76b61783c 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -151,9 +151,10 @@
 
 #define BASOP_NOGLOB                                    /* Disable global symbols in BASOPs, Overflow/Carry in BASOPs disabled, additional BASOPs in case of Overflow */
 
-/* ################### Start FIXES switches ########################### */
 
+/* ################### Start FIXES switches ########################### */
 
+#define TEMP_FIX_2088_MSAN_INIT_ERROR                   /* Eri: Temporary fix for Issue 2088 - MSAN error. Will come with later port of JBM+Split rendering update */
 
 /* #################### End FIXES switches ############################ */
 
diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c
index 3d82cffa748c06d7c134221c301dda68aaf35265..953672fcebf586182bdabc998a0d006ef62af64b 100644
--- a/lib_rend/lib_rend.c
+++ b/lib_rend/lib_rend.c
@@ -2895,6 +2895,9 @@ ivas_error IVAS_REND_Open(
 
         isar_init_split_rend_handles( hIvasRend->splitRendWrapper );
     }
+#ifdef TEMP_FIX_2088_MSAN_INIT_ERROR
+    hIvasRend->splitRendEncBuffer.data = NULL;
+#endif
 
     for ( i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i )
     {