diff --git a/lib_com/options.h b/lib_com/options.h
index 273be4831fc7e9de52941992d07c2163a1d96663..08c9c5c857a9aee2e1414aebadd60247597297f8 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -187,6 +187,7 @@
 #define FIX_1494_SET_SPLITBFI_UNUSED                    /* Dolby: Fix issue 1494, remove unused function setting BFI flag in ISAR renderer */
 #define FIX_1479_MSAN_SPAR_UNINITIALIZED_VALUE          /* Dolby: Fix for issue 1479, MSAN error due to uninitialized value in SPAR */
 #define REMOVE_UNUSED_CODE_IVAS_DEC                     /* VA: remove unused code in ivas_jbm_dec_tc_fx() */
+#define REMOVE_CAM_FROM_IVAS                            /* VA: basop issue 210: remove obsoelte CAM code from IVAS */
 
 /* #################### End BE switches ################################## */
 
diff --git a/lib_enc/ivas_core_enc.c b/lib_enc/ivas_core_enc.c
index 35ac987a064c4d27d12092b879e8998d51c5d2ab..39c1673300a90a6187330d2e0dbbd354ab90b6c5 100644
--- a/lib_enc/ivas_core_enc.c
+++ b/lib_enc/ivas_core_enc.c
@@ -414,12 +414,13 @@ ivas_error ivas_core_enc(
             stereo_icBWE_enc( hCPE, shb_speech, new_swb_speech_buffer, voice_factors[0] );
         }
 
+#ifndef REMOVE_CAM_FROM_IVAS
         /*---------------------------------------------------------------------*
          * Channel-aware mode - write signaling information into the bitstream
          *---------------------------------------------------------------------*/
 
         signaling_enc_rf( st );
-
+#endif
         /*---------------------------------------------------------------------*
          * Common updates
          *---------------------------------------------------------------------*/