diff --git a/lib_com/options.h b/lib_com/options.h
index 2846a9a5ad210e76973a8d35d2fc632f1be9e1a1..798096b9e53a08ca1796d5cea739b0d40ee64ffc 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -199,6 +199,8 @@
 #define ISAR_BITSTREAM_UPDATE_LC3PLUS                   /* FhG: Multiple improvements to the ISAR bitstream when LC3plus is used. See MR 1456 for details. */
 #endif
 
+#define NONBE_FIX_855_JBM_FLUSH_OFFSET                        /* FhG: issue #855: add missing switch here for the code in JBM flushing  */
+
 /* #################### End BASOP porting switches ############################ */
 
 /* clang-format on */
diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c
index e23600095346d4831bf5a4d8f1e4c64adf622456..40966d0c24b915ad7025925be79fcdc6be65c2c4 100644
--- a/lib_dec/ivas_jbm_dec.c
+++ b/lib_dec/ivas_jbm_dec.c
@@ -1577,7 +1577,7 @@ ivas_error ivas_jbm_dec_flush_renderer(
         hTcBuffer->n_samples_buffered = hTcBuffer->n_samples_granularity + n_samples_still_available;
         hTcBuffer->n_samples_available = 0;
         hTcBuffer->n_samples_flushed = n_samples_to_render;
-#ifdef CR_FIX_JBM_FLUSH_OFFSET
+#ifdef NONBE_FIX_855_JBM_FLUSH_OFFSET
         hTcBuffer->n_samples_rendered = 0;
 #else
         hTcBuffer->n_samples_rendered = hTcBuffer->n_samples_granularity;
@@ -1733,7 +1733,7 @@ ivas_error ivas_jbm_dec_flush_renderer(
         {
             return IVAS_ERROR( IVAS_ERR_WRONG_MODE, "Wrong IVAS format in VoIP renderer flushing!" );
         }
-#ifdef CR_FIX_JBM_FLUSH_OFFSET
+#ifdef NONBE_FIX_855_JBM_FLUSH_OFFSET
         hTcBuffer->n_samples_rendered = hTcBuffer->n_samples_granularity;
 #endif
     }