diff --git a/lib_com/options.h b/lib_com/options.h
index 0512ed25043a36e812da620cb0adcba32be8879e..460f6cb5f49fad19530f427e36da202f46121379 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -163,6 +163,7 @@
 #define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */
 #define FIX_FLOAT_1539_G192_FORMAT_SWITCH               /* Nokia: reintroduce format switching for g192 bitstreams */
 #define FIX_FLOAT_1560_SVD_NO_OPT_MAX_W_SIGN            /* FhG: float issue 1560: Avoid optimizing the division on the result of maxWithSign() with -funsafe-math-optimizations */
+#define FIX_2095_REMOVE_UNUSED_ISAR_TABLES              /* Dolby: remove unused ISAR */
 
 /* #################### End BE switches ################################## */
 
diff --git a/lib_dec/ivas_rom_dec.c b/lib_dec/ivas_rom_dec.c
index 602918b86e7c15d2f44a3135719e81469f303fa2..52123b74807610be773784962e926ab9e8b130c6 100644
--- a/lib_dec/ivas_rom_dec.c
+++ b/lib_dec/ivas_rom_dec.c
@@ -500,6 +500,7 @@ static const int16_t huff_nodes_alpha_1D_DF[64][2] =
     { -2, -62 }
 };
 
+#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES
 /* Alpha Fine Huffman table dt */
 static const int16_t huff_nodes_alpha_1D_DT[64][2] = 
 {
@@ -568,6 +569,7 @@ static const int16_t huff_nodes_alpha_1D_DT[64][2] =
     { -3, -64 },
     { -2, -63 }
 };
+#endif
 
 /* Beta Fine Huffman table df0 */
 static const int16_t huff_nodes_first_band_beta[8][2] =
@@ -581,12 +583,13 @@ static const int16_t huff_nodes_beta_1D_DF[16][2] =
     { -9, 1 }, { -10, 2 }, { -8, 3 }, { -11, 4 }, { -7, 5 }, { 7, 6 }, { -6, -12 }, { 9, 8 }, { -5, -13 }, { 11, 10 }, { -4, -14 }, { -15, 12 }, { -3, 13 }, { -16, 14 }, { -2, 15 }, { -1, -17 } 
 };
 
+#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES
 /* Beta Fine Huffman table dt */
 static const int16_t huff_nodes_beta_1D_DT[16][2] =
 { 
     { -9, 1 }, { -10, 2 }, { -8, 3 }, { -11, 4 }, { -7, 5 }, { 7, 6 }, { -6, -12 }, { -13, 8 }, { -5, 9 }, { -14, 10 }, { -4, 11 }, { -15, 12 }, { -3, 13 }, { -16, 14 }, { -2, 15 }, { -1, -17 } 
 };
-
+#endif
 
 const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_df0 =
 {
@@ -600,11 +603,12 @@ const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_df =
     huff_nodes_beta_1D_DF
 };
 
+#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES
 const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_dt =
 {
     huff_nodes_alpha_1D_DT,
     huff_nodes_beta_1D_DT
 };
-
+#endif
 
 /* clang-format on */