diff --git a/lib_com/options.h b/lib_com/options.h
index c0a4dfe8fc3000e79bb716e1d03fc417de1175e0..2a276156810a4c8ba2bffdf0fe62b8ca1daac5a8 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -176,6 +176,8 @@
 
 #define FIX_1068_ASAN_IN_MC_2_BINAURAL_ROOM_IR          /* issue 1068 : Memory leak in MC to BINAURAL_ROOM decoding with bitrate switching*/
 #define FIX_1050_EFAP_ALLOC                             /* FhG: issue 1050: reduction of memory allocated to EFAP handle */
+#define FIX_1099_JBM_MD_HANDLE_ALLOC                    /* VA: issue 1099: Limit the allocation of `hJbmMetadata` handle to MASA and OMASA only */
+
 
 /* #################### End BE switches ################################## */
 
diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c
index 94bddfd1209fa7901b9ed4ecfeb886334e02f9ff..fec8a22206a8a8f37e7182c9aebf510e2dea7fe9 100644
--- a/lib_dec/ivas_init_dec.c
+++ b/lib_dec/ivas_init_dec.c
@@ -2207,7 +2207,11 @@ ivas_error ivas_init_decoder(
         }
     }
 
+#ifdef FIX_1099_JBM_MD_HANDLE_ALLOC
+    if ( ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT ) && st_ivas->hDecoderConfig->Opt_tsm )
+#else
     if ( st_ivas->hJbmMetadata == NULL && st_ivas->hDecoderConfig->Opt_tsm )
+#endif
     {
         if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )
         {