diff --git a/apps/decoder.c b/apps/decoder.c
index 79c825809ea3149a19ea74e7db2f2f902c9f66a6..4b7bf91736bd128679b586c151b0284098323321 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -2003,7 +2003,22 @@ static ivas_error initOnFirstGoodFrame(
             if ( numInitialBadFrames > 0 )
             {
                 /* Duplicate good first frame metadata to fill the beginning of stream. */
+#ifdef NONBE_FIX_1261_MASA_EXT_META_JBM
+                int16_t fullDelayNumSamplesLocal[3];
+                int32_t delayTimeScaleLocal;
+                float delayMs;
+                IVAS_MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;
+                hMasaExtOutMeta = NULL;
+
+                /* fullDelayNumSamples is zeroed so need to re-fetch delay info */
+                if ( ( error = IVAS_DEC_GetDelay( hIvasDec, fullDelayNumSamplesLocal, &delayTimeScaleLocal ) ) != IVAS_ERR_OK )
+                {
+                    fprintf( stderr, "\nUnable to get delay of decoder: %s\n", ivas_error_to_string( error ) );
+                }
+                delayMs = (float) ( fullDelayNumSamplesLocal[0] ) / (float) ( delayTimeScaleLocal );
+#else
                 IVAS_MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta = NULL;
+#endif
 
                 if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta, 0 ) ) != IVAS_ERR_OK )
                 {
@@ -2013,7 +2028,9 @@ static ivas_error initOnFirstGoodFrame(
 
                 for ( int16_t j = 0; j < numInitialBadFrames; ++j )
                 {
+#ifndef NONBE_FIX_1261_MASA_EXT_META_JBM
                     float delayMs = (float) ( pFullDelayNumSamples[0] ) / (float) ( *delayTimeScale );
+#endif
                     if ( ( error = MasaFileWriter_writeFrame( *ppMasaWriter, hMasaExtOutMeta, &delayMs ) ) != IVAS_ERR_OK )
                     {
                         fprintf( stderr, "\nError writing MASA metadata to file: %s\n", MasaFileWriter_getFilePath( *ppMasaWriter ) );
diff --git a/lib_com/options.h b/lib_com/options.h
index 10739ffc6fed098ace65cc823eb4157ef12c2308..716dc78ddb90255a300ee47aa413761c25f9c108 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -174,6 +174,7 @@
 #define NONBE_FIX_1255_OBJ_EDIT_JBM                     /* VA: issue 1255: restore object editing in JBM */
 #define NONBE_FIX_1189_GSC_IVAS_OMASA                   /* VA: Fix for issue 1189: Bitstream desynchornization due to reading/writing of the GSC_IVAS_mode parameter */
 #define NONBE_1214_PLC_LSF_MEMORY                       /* VA: issue 1224: reset ACELP PLC FEC memory in case of switching from MDCT stereo to TD/DFT stereo */
+#define NONBE_FIX_1261_MASA_EXT_META_JBM                /* Nokia: issue #1261: MASA metadata EXT output delay buffer init in JBM */
 
 /* ##################### End NON-BE switches ########################### */