diff --git a/apps/decoder.c b/apps/decoder.c
index 82b40f9ec9f073d0aaf9e74acf6ba625503bb668..306a813e20fee0231e2aa073d272d6d27f536e14 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -3215,7 +3215,7 @@ static ivas_error decodeVoIP(
     int16_t nOutSamples = 0;
     bool bitstreamReadDone = false;
 #ifdef OBJ_EDITING_API
-    bool parameterAvailableForEditing = false;
+    bool parametersAvailableForEditing = false;
 #endif
     uint16_t nSamplesRendered;
 
@@ -3449,7 +3449,11 @@ static ivas_error decodeVoIP(
         }
 
 #ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
+#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM
+        if ( arg.objEditEnabled && arg.objEditFileName != NULL && vec_pos_update == 0 )
+#else
         if ( arg.objEditEnabled && ( arg.objEditFileName != NULL ) )
+#endif
         {
             if ( ( error = ObjectEditFileReader_readNextFrame( objectEditFileReader ) ) != IVAS_ERR_OK )
             {
@@ -3514,13 +3518,13 @@ static ivas_error decodeVoIP(
         {
 #ifdef SUPPORT_JBM_TRACEFILE
 #ifdef OBJ_EDITING_API
-            if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered, &parameterAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )
+            if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered, &parametersAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )
 #else
             if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered, systemTime_ms ) ) != IVAS_ERR_OK )
 #endif
 #else
 #ifdef OBJ_EDITING_API
-            if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, &bitstreamReadDone, &parameterAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )
+            if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, &bitstreamReadDone, &parametersAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )
 #else
             if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, &bitstreamReadDone, systemTime_ms ) ) != IVAS_ERR_OK )
 #endif
@@ -3556,7 +3560,7 @@ static ivas_error decodeVoIP(
 
 #ifdef OBJ_EDITING_API
             /* Object metadata editing */
-            if ( arg.objEditEnabled && parameterAvailableForEditing == true )
+            if ( arg.objEditEnabled && parametersAvailableForEditing == true )
             {
                 IVAS_EDITABLE_PARAMETERS editableParameters;
 
@@ -3709,17 +3713,32 @@ static ivas_error decodeVoIP(
             }
         }
 
+#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM
+        vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;
+#else
         if ( !arg.quietModeEnabled )
         {
             fprintf( stdout, "%-8d\b\b\b\b\b\b\b\b", frame );
         }
         vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;
         frame++;
+#endif
         if ( vec_pos_update == 0 )
         {
             systemTime_ms += vec_pos_len * systemTimeInc_ms;
         }
 
+#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM
+        if ( vec_pos_update == 0 )
+        {
+            frame++;
+            if ( !arg.quietModeEnabled )
+            {
+                fprintf( stdout, "%-8d\b\b\b\b\b\b\b\b", frame );
+            }
+        }
+#endif
+
 #ifdef WMOPS
         update_mem();
         update_wmops();
diff --git a/lib_com/options.h b/lib_com/options.h
index 3a04226ba6b224a83d8f83e3e65acec147ce6290..eecc2fe2513efe915a46258b5f9169dd2e859103 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -222,6 +222,8 @@
 #endif
 #define FIX_1217_OBJECT_EDIT_FILE_INTERFACE             /* Nokia: issue #1217: add decoder functionality to read object edit instructions from a file */
 #define NONBE_1217_OBJ_EDIT_FOA                         /* VA/Nokia: isse 1217: fix crash in object editing to FOA output in ParamISM */
+#define NONBE_FIX_1255_OBJ_EDIT_JBM                     /* VA: issue 1255: restore object editing in JBM */
+
 
 /* #################### End BASOP porting switches ############################ */
 
diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c
index 67592f157b5654a042b9d8be5be3e0ce10cc5355..9c17b5fa40880ee7a58d04e80285c876a7b9457b 100644
--- a/lib_dec/lib_dec.c
+++ b/lib_dec/lib_dec.c
@@ -4229,13 +4229,14 @@ ivas_error IVAS_DEC_VoIP_GetSamples(
                 hIvasDec->nSamplesRendered = 0;
 #endif
             }
-
+#ifndef NONBE_FIX_1255_OBJ_EDIT_JBM
 #ifdef OBJ_EDITING_API
             if ( hIvasDec->hasBeenFedFirstGoodFrame )
             {
                 *parametersAvailableForEditing = true;
                 return IVAS_ERR_OK;
             }
+#endif
 #endif
         }
 
@@ -4274,7 +4275,7 @@ ivas_error IVAS_DEC_VoIP_GetSamples(
                     hIvasDec->nSamplesFlushed = nSamplesFlushed_ref;
 #endif
                     *bitstreamReadDone = false;
-#ifdef LIB_DEC_REVISION
+#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM
                     *parametersAvailableForEditing = true;
                     return IVAS_ERR_OK;
 #endif