diff --git a/lib_com/bitstream.c b/lib_com/bitstream.c
index d2aae93ed416c50f8086b2b43b62f32b1c7e9de6..04fdb8fe0bb9ba6f01616a22bae4e95362ad2708 100644
--- a/lib_com/bitstream.c
+++ b/lib_com/bitstream.c
@@ -791,31 +791,59 @@ int16_t get_ivas_max_num_indices_metadata(                                /* o
         }
         else if ( ivas_total_brate <= IVAS_32k )
         {
+#ifdef FIX_502_IND_LIST_SIZE
+            return 125;
+#else
             return 110;
+#endif
         }
         else if ( ivas_total_brate <= IVAS_48k )
         {
+#ifdef FIX_502_IND_LIST_SIZE
+            return 205;
+#else
             return 180;
+#endif
         }
         else if ( ivas_total_brate <= IVAS_96k )
         {
+#ifdef FIX_502_IND_LIST_SIZE
+            return 240;
+#else
             return 200;
+#endif
         }
         else if ( ivas_total_brate <= IVAS_128k )
         {
+#ifdef FIX_502_IND_LIST_SIZE
+            return 305;
+#else
             return 250;
+#endif
         }
         else if ( ivas_total_brate <= IVAS_160k )
         {
+#ifdef FIX_502_IND_LIST_SIZE
+            return 425;
+#else
             return 320;
+#endif
         }
         else if ( ivas_total_brate <= IVAS_192k )
         {
+#ifdef FIX_502_IND_LIST_SIZE
+            return 630;
+#else
             return 430;
+#endif
         }
         else if ( ivas_total_brate <= IVAS_256k )
         {
+#ifdef FIX_502_IND_LIST_SIZE
+            return 850;
+#else
             return 600;
+#endif
         }
         else if ( ivas_total_brate <= IVAS_384k )
         {
@@ -823,7 +851,11 @@ int16_t get_ivas_max_num_indices_metadata(                                /* o
         }
         else
         {
+#ifdef FIX_502_IND_LIST_SIZE
+            return 1750;
+#else
             return 1500;
+#endif
         }
     }
     else if ( ivas_format == MC_FORMAT )
@@ -838,7 +870,11 @@ int16_t get_ivas_max_num_indices_metadata(                                /* o
         }
         else if ( ivas_total_brate <= IVAS_64k )
         {
+#ifdef FIX_502_IND_LIST_SIZE
+            return 210;
+#else
             return 200;
+#endif
         }
         else if ( ivas_total_brate <= IVAS_96k )
         {
diff --git a/lib_com/options.h b/lib_com/options.h
index 814a323d0f390959f3886f63cfdbad7cd0bf29cb..72332841b3a6f77bc673e4a942678f17ec0b407b 100755
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -210,6 +210,8 @@
 #define FIX_I503_ASAN_ERROR_IND_LIST                    /* VA: fix issue #503: address sanitizer error with IND_LIST_DYN */
 #define FIX_473_JITTER_NONDIEGETIC_PANNING              /* FhG,Orange: add missing non-diegetic panning to JITTER */
 
+#define FIX_502_IND_LIST_SIZE                           /* Fix issue #502: insufficient index buffer sizes */
+
 #ifdef HR_METADATA
 #define FIX_505_MASA_SPHGRID_REUSE                      /* Nokia: Fix issue #505: MASA spherical grid reuse fix */
 #endif