diff --git a/lib_com/options.h b/lib_com/options.h
index 4594bc79fa49fa919106f891f76f004c635d9b31..7bfbfa5170083b6b702f2db53ff0d7f242f31284 100755
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -171,7 +171,7 @@
 #define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */
 #define FIX_1413_IGF_INIT_PRINTOUT                      /* FhG: use correct variable for IGF initiliazation */
 #define RENDERER_MD_SYNC_DELAY_TO_INTEGER               /* FhG: change data type of metadata sync delay in ext renderer to int16_t for better BASOP portability (and nicer code) */
-
+#define FIX_1436_DISABLE_EXT_MD_OBJ_EDIT_WHEN_NOT_USED  /* Eri: Ignore extended metadata parameters when not used in object editing */
 
 /* #################### End BE switches ################################## */
 
diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c
index ff312ddfe416163aa791761b8eaab1fcf6f5c4c6..ad812cc771f333150518aa7e8e3a9b931e45b5ca 100644
--- a/lib_dec/lib_dec.c
+++ b/lib_dec/lib_dec.c
@@ -1512,9 +1512,11 @@ ivas_error IVAS_DEC_SetEditableParameters(
             {
                 st_ivas->hIsmMetaData[obj]->edited_azimuth = hIvasEditableParameters.ism_metadata[obj].azimuth;
                 st_ivas->hIsmMetaData[obj]->edited_elevation = hIvasEditableParameters.ism_metadata[obj].elevation;
+#ifndef FIX_1436_DISABLE_EXT_MD_OBJ_EDIT_WHEN_NOT_USED
                 st_ivas->hIsmMetaData[obj]->edited_radius = hIvasEditableParameters.ism_metadata[obj].radius;
                 st_ivas->hIsmMetaData[obj]->edited_yaw = hIvasEditableParameters.ism_metadata[obj].yaw;
                 st_ivas->hIsmMetaData[obj]->edited_pitch = hIvasEditableParameters.ism_metadata[obj].pitch;
+#endif
                 st_ivas->hIsmMetaData[obj]->edited_gain = hIvasEditableParameters.ism_metadata[obj].gain;
                 st_ivas->hIsmMetaData[obj]->non_diegetic_flag = hIvasEditableParameters.ism_metadata[obj].non_diegetic_flag;
             }
@@ -1683,9 +1685,11 @@ ivas_error IVAS_DEC_SetEditableParameters(
             {
                 st_ivas->hIsmMetaData[obj]->edited_azimuth = hIvasEditableParameters.ism_metadata[obj].azimuth;
                 st_ivas->hIsmMetaData[obj]->edited_elevation = hIvasEditableParameters.ism_metadata[obj].elevation;
+#ifndef FIX_1436_DISABLE_EXT_MD_OBJ_EDIT_WHEN_NOT_USED
                 st_ivas->hIsmMetaData[obj]->edited_yaw = hIvasEditableParameters.ism_metadata[obj].yaw;
                 st_ivas->hIsmMetaData[obj]->edited_pitch = hIvasEditableParameters.ism_metadata[obj].pitch;
                 st_ivas->hIsmMetaData[obj]->edited_radius = hIvasEditableParameters.ism_metadata[obj].radius;
+#endif
                 st_ivas->hIsmMetaData[obj]->edited_gain = hIvasEditableParameters.ism_metadata[obj].gain;
                 st_ivas->hIsmMetaData[obj]->non_diegetic_flag = hIvasEditableParameters.ism_metadata[obj].non_diegetic_flag;
             }