diff --git a/lib_com/options.h b/lib_com/options.h
index 67e88ae43283c1c47338714591545b1f3507ba7c..d88efcb33c9f9063d2dc70e52994d4b42e1377df 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -101,12 +101,13 @@
 #define FIX_BASOP_2532_cx_e                             /* FhG: Fix issue 2532 about additional exponent variable*/
 #define HARMONIZE_2543_SQ_gain                          /* FhG: Harmonize SQ_gain */
 #define FIX_ISSUE_2533_EXTRA_CONDITION                  /* FhG: Fix issue basop 2533 removing the extra condition*/
-#define HARMONIZE_2537_SetTCXModeInfo                   /* FhG: Harmonize SetTCXModeInfo  - IVAS_VERSION OBVIOUSLY NOT FITTING FOR EVS - pipes not green */
+#define HARMONIZE_2537_SetTCXModeInfo                     /* FhG: Harmonize SetTCXModeInfo  - IVAS_VERSION OBVIOUSLY NOT FITTING FOR EVS - pipes not green */
 #define HARMONIZE_2537_GetTCXMaxenergyChange            /* FhG: Harmonize GetTCXMaxenergyChange */
 #define HARMONIZE_2508_InitTransientDetection           /* FhG: harmonize GetAttackForTCXDecision derivates for evs/ivas  */
 #define FIX_BASOP_2555_FRAMELEN_CALC                    /* FhG: BASOP issue 2555: Simplify (sub-)framelength calculation in ivas_mdct_core_tns_ns_fx() */
 #define FIX_BASOP_2095_REMOVE_TABLES_PT01               /* FhG: BASOP issue 2095: remove unused tables, part 01 */
 #define FIX_2346_DUPLICATED_IGF_FUNCTIONS_2             /* FhG: part 2 of basop issue 2346: Review potentially duplicated IGF functions */
+#define FIX_2095_REMOVE_UNUSED_ISAR_TABLES              /* Dolby: remove unused ISAR */
 
 /* #################### End BE switches ################################## */
 
diff --git a/lib_dec/ivas_rom_dec.h b/lib_dec/ivas_rom_dec.h
index aafe3bce983565f66d416a2ad2e9fc450951eca2..f79e95cef4c4a477f12516620df86d4d1b887c0f 100644
--- a/lib_dec/ivas_rom_dec.h
+++ b/lib_dec/ivas_rom_dec.h
@@ -96,6 +96,8 @@ extern const Word16 dirac_dithering_ele_scale_fx[DIRAC_DIFFUSE_LEVELS];
 
 extern const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_df0;
 extern const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_df;
+#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES
 extern const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_dt;
+#endif
 
 #endif /* IVAS_ROM_DEC_H */
diff --git a/lib_dec/ivas_rom_dec_fx.c b/lib_dec/ivas_rom_dec_fx.c
index f86a8ee88d1cde78201291a911ad1b974711d051..0f1b4108ae092be106288918f506d3f6970d121e 100644
--- a/lib_dec/ivas_rom_dec_fx.c
+++ b/lib_dec/ivas_rom_dec_fx.c
@@ -476,6 +476,7 @@ static const Word16 huff_nodes_alpha_1D_DF[64][2] =
     { -2, -62 }
 };
 
+#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES
 /* Alpha Fine Huffman table dt */
 static const Word16 huff_nodes_alpha_1D_DT[64][2] = 
 {
@@ -544,6 +545,7 @@ static const Word16 huff_nodes_alpha_1D_DT[64][2] =
     { -3, -64 },
     { -2, -63 }
 };
+#endif
 
 /* Beta Fine Huffman table df0 */
 static const Word16 huff_nodes_first_band_beta[8][2] =
@@ -557,12 +559,13 @@ static const Word16 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 Word16 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 =
 {
@@ -576,11 +579,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 */
diff --git a/lib_isar/isar_rom_lcld_tables.c b/lib_isar/isar_rom_lcld_tables.c
index d3b596b40ee3c8c9f212c463c372d96b53c9dc42..287d3f70c37544b29a75fba539342674847f01b1 100644
--- a/lib_isar/isar_rom_lcld_tables.c
+++ b/lib_isar/isar_rom_lcld_tables.c
@@ -294,6 +294,7 @@ const Word32 c_aiQuantMaxValues_fx[ALLOC_TABLE_SIZE] = {
     377487360,
 };
 
+#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES
 const Word32 c_aiQuantMaxValues[ALLOC_TABLE_SIZE] = {
     0,
     3,
@@ -328,6 +329,7 @@ const Word32 c_aiQuantMaxValues[ALLOC_TABLE_SIZE] = {
     152,
     180,
 };
+#endif
 
 const Word32 c_aiHuffmanDim_fx[ALLOC_TABLE_SIZE] = {
     2,
@@ -468,6 +470,8 @@ const Word32 c_aiHuffmanMod[ALLOC_TABLE_SIZE] = {
     1,
     1,
 };
+
+#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES
 const Word32 c_aiHuffmanSize[ALLOC_TABLE_SIZE] = {
     1,
     16,
@@ -502,6 +506,7 @@ const Word32 c_aiHuffmanSize[ALLOC_TABLE_SIZE] = {
     153,
     181,
 };
+#endif
 
 const UWord32 c_aaiRMSEnvHuffEnc[64][2] = {
     { 0x0014, 0x0000 },
@@ -19208,6 +19213,7 @@ const Word16 c_aiLogAddTable_fx[LOG_ADD_TABLE_LENGTH] = {
     0x00,
 };
 
+#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES
 const Word32 c_aiLogAddTable[LOG_ADD_TABLE_LENGTH] = {
     0x40,
     0x40,
@@ -19722,6 +19728,7 @@ const Word32 c_aiLogAddTable[LOG_ADD_TABLE_LENGTH] = {
     0x00,
     0x00,
 };
+#endif
 
 const Word16 c_aiBandwidthAdjust48_fx[MAX_BANDS_48] = {
     0,
@@ -19749,6 +19756,7 @@ const Word16 c_aiBandwidthAdjust48_fx[MAX_BANDS_48] = {
     213,
 };
 
+#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES
 const Word32 c_aiBandwidthAdjust48[MAX_BANDS_48] = {
 
     0,
@@ -19775,6 +19783,7 @@ const Word32 c_aiBandwidthAdjust48[MAX_BANDS_48] = {
     180,
     213,
 };
+#endif
 
 const Word16 c_aiAbsoluteThresh48_fx[MAX_BANDS_48] = {
     -1787,
@@ -19802,6 +19811,7 @@ const Word16 c_aiAbsoluteThresh48_fx[MAX_BANDS_48] = {
     -401,
 };
 
+#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES
 const Word32 c_aiAbsoluteThresh48[MAX_BANDS_48] = {
     -1787,
     -1787,
@@ -19827,6 +19837,7 @@ const Word32 c_aiAbsoluteThresh48[MAX_BANDS_48] = {
     -409,
     -401,
 };
+#endif
 
 #if PERCEPTUAL_MODEL_SLGAIN_SHIFT == 4
 const Word32 c_aiDefaultTheta48[MAX_BANDS_48] = {
@@ -20440,6 +20451,7 @@ const Word16 c_aaiSpreadFunction48_fx[MAX_BANDS_48 * MAX_BANDS_48] = {
     -114,
 };
 
+#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES
 const Word32 c_aaiSpreadFunction48[MAX_BANDS_48 * MAX_BANDS_48] = {
     0,
     -1561,
@@ -20972,6 +20984,8 @@ const Word32 c_aaiSpreadFunction48[MAX_BANDS_48 * MAX_BANDS_48] = {
     -114,
 };
 
+#endif
+
 const Word32 c_pfMagLUT[8] = /* Q31 */ {
     0, 394599072, 775760576, 1130504448, 1446750336, 1713728896, 1922348544, 2065504896
 };
@@ -20994,6 +21008,8 @@ const Word32 c_pfP2RImagLUT[32] = /* Q31 */ {
     821806080, 418953248
 };
 
+#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES
 const Word32 c_pfWindowLUT[LCLD_PRED_WIN_LEN] = /* Q31 */ {
     190779840, 338280192, 610825408, 966922816, 1352359680, 1708457216, 1981002240, 2128502656, 2128502528, 1981002240, 1708456960, 1352359808, 966922624, 610825152, 338280192, 190779776
 };
+#endif
diff --git a/lib_isar/isar_rom_lcld_tables.h b/lib_isar/isar_rom_lcld_tables.h
index 0b8a46bb630acef0a75efad1c0e88b05e38edc42..278ca2d741e8118c22798bbfa4aac44466510dc6 100644
--- a/lib_isar/isar_rom_lcld_tables.h
+++ b/lib_isar/isar_rom_lcld_tables.h
@@ -112,14 +112,12 @@ extern const Word32 c_aiDefaultTheta48[MAX_BANDS_48];
 
 extern const Word32 c_afInvScaleFactor_fx[ALLOC_TABLE_SIZE];
 extern const Word16 c_afRMSEnvReconstructTable_exp[ENV_RECONSTRUCT_TABLE_SIZE];
-extern const Word32 c_aiQuantMaxValues[ALLOC_TABLE_SIZE];
 extern const Word32 c_aiHuffmanDim[ALLOC_TABLE_SIZE];
 extern const Word32 c_aiHuffmanMod[ALLOC_TABLE_SIZE];
 extern const Word32 c_aiHuffmanDim_fx[ALLOC_TABLE_SIZE];
 extern const Word32 c_aiHuffmanMod_fx[ALLOC_TABLE_SIZE];
 extern const Word32 c_afScaleFactor_fx[ALLOC_TABLE_SIZE];
 extern const Word32 c_aiQuantMaxValues_fx[ALLOC_TABLE_SIZE];
-extern const Word32 c_aiHuffmanSize[ALLOC_TABLE_SIZE];
 
 
 #define LOG_ADD_TABLE_LENGTH ( 512 )
@@ -127,17 +125,19 @@ extern const Word32 c_aiHuffmanSize[ALLOC_TABLE_SIZE];
 extern const Word32 c_aiBandwidths48[MAX_BANDS_48];
 extern const Word16 c_aiLogAddTable_fx[LOG_ADD_TABLE_LENGTH];
 extern const Word16 c_aiBandwidthAdjust48_fx[MAX_BANDS_48];
-extern const Word32 c_aiLogAddTable[LOG_ADD_TABLE_LENGTH];
-extern const Word32 c_aiBandwidthAdjust48[MAX_BANDS_48];
-
-
 extern const Word16 c_aiAbsoluteThresh48_fx[MAX_BANDS_48];
 extern const Word16 c_aiDefaultTheta48_fx[MAX_BANDS_48];
 extern const Word16 c_aaiSpreadFunction48_fx[MAX_BANDS_48 * MAX_BANDS_48];
-extern const Word32 c_aiAbsoluteThresh48[MAX_BANDS_48];
 extern const Word32 c_aiDefaultTheta48[MAX_BANDS_48];
-extern const Word32 c_aaiSpreadFunction48[MAX_BANDS_48 * MAX_BANDS_48];
 
+#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES
+extern const Word32 c_aiQuantMaxValues[ALLOC_TABLE_SIZE];
+extern const Word32 c_aiLogAddTable[LOG_ADD_TABLE_LENGTH];
+extern const Word32 c_aiHuffmanSize[ALLOC_TABLE_SIZE];
+extern const Word32 c_aiBandwidthAdjust48[MAX_BANDS_48];
+extern const Word32 c_aiAbsoluteThresh48[MAX_BANDS_48];
+extern const Word32 c_aaiSpreadFunction48[MAX_BANDS_48 * MAX_BANDS_48];
+#endif
 
 #define PRED_QUNAT_FILTER_MAG_BITS   ( 3 )
 #define PRED_QUANT_FILTER_PHASE_BITS ( 5 )
@@ -235,10 +235,11 @@ extern const Word32 ( *c_apaiDemodTables[ALLOC_TABLE_SIZE] )[2];
 extern const UWord32 c_aaiRMSEnvHuffEnc[64][2];
 extern const UWord32 c_aaiRMSEnvHuffDec[13][HUFF_DEC_TABLE_SIZE];
 
-extern const Word32 c_pfMagLUT[8];                    /* Q31 */
-extern const Word32 c_pfP2RRealLUT[32];               /* Q31 */
-extern const Word32 c_pfP2RImagLUT[32];               /* Q31 */
+extern const Word32 c_pfMagLUT[8];      /* Q31 */
+extern const Word32 c_pfP2RRealLUT[32]; /* Q31 */
+extern const Word32 c_pfP2RImagLUT[32]; /* Q31 */
+#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES
 extern const Word32 c_pfWindowLUT[LCLD_PRED_WIN_LEN]; /* Q31 */
-
+#endif
 
 #endif /* ISAR_ROM_LCLD_TABLES_H_ */