diff --git a/lib_com/options.h b/lib_com/options.h
index 5666b676e9fb8cb3ef63403095fa1e7f0188213d..b65aaf43b0cf45ca126e3f20286be8e9b2039b57 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -125,6 +125,7 @@
 #define NONBE_FIX_1255_OBJ_EDIT_JBM                     /* VA: issue 1255: restore object editing in JBM */
 #define FIX_1372_OSBA_OBJECT_EDITING                    /* VA: issue 1372: Fix OSBA object-editing in BINAURAL_ROOM_IR */
 #define FIX_2140_OBJECT_EDITING_SANITIZER_ISSUES        /* Nokia: Issue 2140, fixes three different sanitizer issues persisting in object editing code. */
+#define NONBE_FIX_1172_OBJ_EDIT_JBM                     /* VA: issue 1172: fix OMASA object editing in JBM */
 
 /* #################### End BASOP porting switches ############################ */
 
diff --git a/lib_dec/lib_dec_fx.c b/lib_dec/lib_dec_fx.c
index 7ee9289a62f05b8f0f792739f3cfe45bc9b7c93e..2acd0225c019abcbc7726548bfdc051ccabc70a7 100644
--- a/lib_dec/lib_dec_fx.c
+++ b/lib_dec/lib_dec_fx.c
@@ -4387,12 +4387,12 @@ ivas_error IVAS_DEC_SetEditableParameters(
                 move32();
                 st_ivas->hIsmMetaData[obj]->edited_radius_fx = hIvasEditableParameters.ism_metadata[obj].radius_fx;
                 move32();
-                st_ivas->hIsmMetaData[obj]->edited_gain_fx = hIvasEditableParameters.ism_metadata[obj].gain_fx;
-                move32();
                 st_ivas->hIsmMetaData[obj]->edited_yaw_fx = hIvasEditableParameters.ism_metadata[obj].yaw_fx;
                 move32();
                 st_ivas->hIsmMetaData[obj]->edited_pitch_fx = hIvasEditableParameters.ism_metadata[obj].pitch_fx;
                 move32();
+                st_ivas->hIsmMetaData[obj]->edited_gain_fx = hIvasEditableParameters.ism_metadata[obj].gain_fx;
+                move32();
                 st_ivas->hIsmMetaData[obj]->non_diegetic_flag = hIvasEditableParameters.ism_metadata[obj].non_diegetic_flag;
                 move16();
             }
@@ -4543,7 +4543,7 @@ ivas_error IVAS_DEC_SetEditableParameters(
                 }
                 ELSE
                 {
-                    /* detect editing in ISM_MASA_MODE_DISC. optionally, add quantization-resolution -based thresholds */
+                    /* detect editing in ISM_MASA_MODE_DISC mode */
                     test();
                     IF( L_abs( L_sub( st_ivas->hIsmMetaData[obj]->azimuth_fx, hIvasEditableParameters.ism_metadata[obj].azimuth_fx ) ) > OMASA_AZI_EDIT_THR_FX ||
                         L_abs( L_sub( st_ivas->hIsmMetaData[obj]->elevation_fx, hIvasEditableParameters.ism_metadata[obj].elevation_fx ) ) > OMASA_ELE_EDIT_THR_FX )
@@ -4579,6 +4579,22 @@ ivas_error IVAS_DEC_SetEditableParameters(
             /* Copy edited values to hIsmMetaData struct */
             IF( st_ivas->hIsmMetaData[obj] != NULL )
             {
+#ifdef NONBE_FIX_1172_OBJ_EDIT_JBM
+                st_ivas->hIsmMetaData[obj]->edited_azimuth_fx = hIvasEditableParameters.ism_metadata[obj].azimuth_fx;
+                move32();
+                st_ivas->hIsmMetaData[obj]->edited_elevation_fx = hIvasEditableParameters.ism_metadata[obj].elevation_fx;
+                move32();
+                st_ivas->hIsmMetaData[obj]->edited_yaw_fx = hIvasEditableParameters.ism_metadata[obj].yaw_fx;
+                move32();
+                st_ivas->hIsmMetaData[obj]->edited_pitch_fx = hIvasEditableParameters.ism_metadata[obj].pitch_fx;
+                move32();
+                st_ivas->hIsmMetaData[obj]->edited_radius_fx = hIvasEditableParameters.ism_metadata[obj].radius_fx;
+                move32();
+                st_ivas->hIsmMetaData[obj]->edited_gain_fx = hIvasEditableParameters.ism_metadata[obj].gain_fx; // TODO: check incoming Q value
+                move32();
+                st_ivas->hIsmMetaData[obj]->non_diegetic_flag = hIvasEditableParameters.ism_metadata[obj].non_diegetic_flag;
+                move16();
+#else
                 st_ivas->hIsmMetaData[obj]->azimuth_fx = hIvasEditableParameters.ism_metadata[obj].azimuth_fx;
                 move32();
                 st_ivas->hIsmMetaData[obj]->elevation_fx = hIvasEditableParameters.ism_metadata[obj].elevation_fx;
@@ -4593,6 +4609,7 @@ ivas_error IVAS_DEC_SetEditableParameters(
                 move32();
                 st_ivas->hIsmMetaData[obj]->non_diegetic_flag = hIvasEditableParameters.ism_metadata[obj].non_diegetic_flag;
                 move16();
+#endif
             }
         }