diff --git a/lib_com/options.h b/lib_com/options.h
index a84db75dc7f0d4bea007e5a2a557a098c1cd5bfd..d3a5c3fa2aa1c8eb68b320fa32f5d3003b5064fb 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -187,6 +187,7 @@
 #define NONBE_FIX_1052_SBA_EXT_FIX                      /* VA: SBA external output support fix - do not overwrite "output_config" parameter */
 #define FIX_1113_CLDFB_REND_IN_ISAR                     /* issue 1113: fix the use of CLDFB renderer in split-rendering at the external renderer */
 #define NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING       /* VA: issue 1110: fix encoder crash in the stereo DTX bitrate switching condition */
+#define FIX_1099_JBM_MD_HANDLE_ALLOC                    /* VA: issue 1099: Limit the allocation of `hJbmMetadata` handle to MASA and OMASA only */
 #define NONBE_1894_OSBA_SCALING                         /* FhG: port OSBA scaling MRs (298,355,360) jointly */
 #define NONBE_FIX_1141_OSBA_ROOM_RENDERING              /* FhG: Fix for issue 1141: render objects in OSBA decoder with room effect  */
 #define NONBE_1360_LFE_DELAY                            /* Dlb: LFE delay alignment when rendering in CLDFB domain*/
diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c
index c3ef7ab59ab0c2ed0cad8d83c048a2b0903b8ffa..f1b356ba4ebd746bd7b6ceb2e0b3bd2fb8db4e74 100644
--- a/lib_dec/ivas_init_dec.c
+++ b/lib_dec/ivas_init_dec.c
@@ -2239,8 +2239,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 )
         {