diff --git a/lib_com/options.h b/lib_com/options.h
index e666308ca10ce63d00d4cca87f4ffb11d99296b1..50db2a5e4aaaa2d7769542c2e722849ef61daa6b 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -117,6 +117,7 @@
 #define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR            /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */
 #define NONBE_FIX_1052_SBA_EXT_FIX                      /* VA: SBA external output support fix - do not overwrite "output_config" parameter */
 #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: do not scale OSBA inputs by 0.5 any more */
 #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_fx.c b/lib_dec/ivas_init_dec_fx.c
index 667b9dc32d527761a88f9b5be3787e4f9d5d91d6..3c96b53921e5259a8000fa5f7507a7f912d0560e 100644
--- a/lib_dec/ivas_init_dec_fx.c
+++ b/lib_dec/ivas_init_dec_fx.c
@@ -2698,7 +2698,6 @@ ivas_error ivas_init_decoder_fx(
      *-----------------------------------------------------------------*/
 
     IF( st_ivas->hTcBuffer == NULL )
-
     {
         /* no module has yet open the TC buffer, open a default one */
         n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels_fx( st_ivas );
@@ -2717,8 +2716,14 @@ ivas_error ivas_init_decoder_fx(
             return error;
         }
     }
+
+    test();
+#ifdef FIX_1099_JBM_MD_HANDLE_ALLOC
     test();
+    IF( ( EQ_32( st_ivas->ivas_format, MASA_FORMAT ) || EQ_32( 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( EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )
         {