diff --git a/lib_com/options.h b/lib_com/options.h
index 8f87cd3fd2caaa76b1c7840740f4a2bf2488da47..395e2540a7df2c3df44664a625f5b7a771df44e1 100755
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -154,9 +154,12 @@
 #define FIX_371_DELAY_REPORT                            /* Issue 371: div. by zero with -no_delay_cmp */
 
 #ifdef FIX_I109_ORIENTATION_TRACKING
-#define OTR_REFERENCE_VECTOR_TRACKING                 /* FhG: enables the reference position orientation tracking mode */
+#define OTR_REFERENCE_VECTOR_TRACKING                   /* FhG: enables the reference position orientation tracking mode */
 #endif
 
+#define FIX_380_BFI_PARAMISM                            /* VA: issue 380 - fix metadata recovery in ParamISM BFI */
+
+
 /* ################## End DEVELOPMENT switches ######################### */
 /* clang-format on */
 #endif
diff --git a/lib_dec/ivas_ism_metadata_dec.c b/lib_dec/ivas_ism_metadata_dec.c
index 7c8946fc437b46305b6467ecae21c12db52b6113..37b01f9315ff498e37417b593adbaf83a9b6b29d 100644
--- a/lib_dec/ivas_ism_metadata_dec.c
+++ b/lib_dec/ivas_ism_metadata_dec.c
@@ -488,12 +488,26 @@ ivas_error ivas_ism_metadata_dec(
     }
     else /* BFI */
     {
+#ifdef FIX_380_BFI_PARAMISM
+        /* "num_obj", "hIsmMeta->azimuth" and "hIsmMeta->elevation" are recycled from the last frame */
+        if ( ism_mode == ISM_MODE_PARAM )
+        {
+            num_obj = hParamIsm->num_obj;
+        }
+        else if ( ism_mode == ISM_MODE_DISC )
+        {
+            num_obj = *nchan_transport;
+        }
+
+        for ( ch = 0; ch < num_obj; ch++ )
+#else
         /* "*nISms", "hIsmMeta->azimuth" and "hIsmMeta->elevation" are recycled from the last frame */
         for ( ch = 0; ch < *nchan_transport; ch++ )
         {
             hIsmMeta[ch]->ism_metadata_flag = hIsmMeta[ch]->last_ism_metadata_flag;
         }
         for ( ; ch < num_obj; ch++ )
+#endif
         {
             hIsmMeta[ch]->last_ism_metadata_flag = hIsmMeta[ch]->ism_metadata_flag;
         }
@@ -504,12 +518,17 @@ ivas_error ivas_ism_metadata_dec(
         {
             for ( ch = 0; ch < num_obj; ch++ )
             {
+#ifdef FIX_380_BFI_PARAMISM
+                hParamIsm->azi_index[ch] = hParamIsm->azi_index[ch] + hParamIsm->last_az_sgn[ch] * hParamIsm->last_az_diff[ch];
+                hParamIsm->ele_index[ch] = hParamIsm->ele_index[ch] + hParamIsm->last_el_sgn[ch] * hParamIsm->last_el_diff[ch];
+#else
                 hParamIsm->azi_index[ch] = hParamIsm->azi_index[ch] + hParamIsm->last_az_sgn[ch] * hParamIsm->last_az_diff[ch];
                 /*hParamIsm->azi_index[ch] = hParamIsm->azi_index[ch] % hParamIsm->az_alpha[ch];*/
                 hParamIsm->azi_index[ch] = hParamIsm->azi_index[ch];
                 hParamIsm->ele_index[ch] = hParamIsm->ele_index[ch] + hParamIsm->last_el_sgn[ch] * hParamIsm->last_el_diff[ch];
                 /*hParamIsm->ele_index[ch] = hParamIsm->ele_index[ch] % hParamIsm->ele_alpha;*/
                 hParamIsm->ele_index[ch] = hParamIsm->ele_index[ch];
+#endif
 #ifdef TD5
                 hIsmMeta[ch]->angle[0].last_azimuth_idx = hParamIsm->azi_index[ch];
                 hIsmMeta[ch]->angle[0].last_elevation_idx = hParamIsm->ele_index[ch];
@@ -558,7 +577,6 @@ ivas_error ivas_ism_metadata_dec(
     {
         for ( ch = 0; ch < *nchan_transport; ch++ )
         {
-
             hSCE[ch]->element_brate = hSCE[ch]->last_element_brate;
             hSCE[ch]->hCoreCoder[0]->total_brate = hSCE[ch]->hCoreCoder[0]->last_total_brate;
         }