diff --git a/lib_com/options.h b/lib_com/options.h
index a33f3986fc5c6b8e1cc732e2da8cbe9e8e4c131d..843afbcfad77384320f118d2e678d6c42a2f733a 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -171,6 +171,7 @@
 
 #define FIX_1576_LCLD_CRASH_DIFFERENT_CODEC_ISAR_FRAME_SIZE  /* Dolby: float issue 1576: fix for crash in LCLD mode when codec frame size is less than isar frame size */
 #define FIX_FLOAT_1600_OMASA_WRONG_RENDER_PATH          /* Nokia: float issue 1600: fix initialization condition of stereo type detection for OMASA */
+#define FIX_2649_RESET_ISM_METADATA                     /* VA: basop issue 2649: harmonize ISM metadata reset */
 
 /* ##################### End NON-BE switches ########################### */
 
diff --git a/lib_enc/lib_enc.c b/lib_enc/lib_enc.c
index 3f87aad9a84fd1fe157e7f023f2800c3f030dd5e..bf306d6e98dfe59d6b234b1749fb40963ea4572e 100644
--- a/lib_enc/lib_enc.c
+++ b/lib_enc/lib_enc.c
@@ -1187,13 +1187,21 @@ ivas_error IVAS_ENC_EncodeFrameToSerial(
         return error;
     }
 
+#ifdef FIX_2649_RESET_ISM_METADATA
+    if ( hEncoderConfig->ivas_format == ISM_FORMAT || hEncoderConfig->ivas_format == MASA_ISM_FORMAT || hEncoderConfig->ivas_format == SBA_ISM_FORMAT )
+#else
     if ( hEncoderConfig->ivas_format == ISM_FORMAT )
+#endif
     {
+#ifdef FIX_2649_RESET_ISM_METADATA
+        for ( i = 0; i < hEncoderConfig->nchan_ism; ++i )
+#else
         for ( i = 0; i < hEncoderConfig->nchan_inp; ++i )
+#endif
         {
             if ( !hIvasEnc->ismMetadataProvided[i] )
             {
-                ivas_ism_reset_metadata_API( hIvasEnc->st_ivas->hIsmMetaData[i] );
+                ivas_ism_reset_metadata_API( st_ivas->hIsmMetaData[i] );
             }
         }
         resetIsmMetadataProvidedFlags( hIvasEnc );