diff --git a/apps/decoder.c b/apps/decoder.c
index efe6c53343b1599f29a3a9dddbcc5aecdf9a947c..a4424c92c59210f10c511792c2fdba0ecdc27da1 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -1789,7 +1789,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 )
                 {
@@ -1799,7 +1814,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 3e11805fcc15d132eae7fadd29420369ba9e6ad5..8411d060e1491f069a694daae6efc8849ce69938 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -100,6 +100,7 @@
 #define FIX_1319_STACK_SBA_DECODER                      /* VA: issue 1319: Optimize the definition of buffer lengths in the SBA decoder */
 #define FIX_1320_STACK_CPE_DECODER                      /* VA: issue 1320: Optimize the stack memory consumption in the CPE decoder */
 #define FIX_1984_SAT_IN_PSYCHAD                         /* VA: Issue 1984: proposal to fix an assert */
+#define NONBE_FIX_1261_MASA_EXT_META_JBM                /* Nokia: issue #1261: MASA metadata EXT output delay buffer init in JBM */
 
 /* #################### End BASOP porting switches ############################ */