diff --git a/lib_com/options.h b/lib_com/options.h
index b127f3a41b5a31e7b86e8e874aa4c2ab076c6278..8a5f0f8b5283c6823111071f07b47a85d4c116b1 100755
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -178,7 +178,7 @@
 #define NONBE_FIX_862_UBSAN_SPAR_DEC_BR_SW_PLC                /* DLB: issue 862 : UBSAN: out-of-bound error in SPAR for OSBA bitrate switching with PLC*/
 #define NONBE_FIX_DISCRETE_ISM_NOISE_SEED_HANDLING            /* FhG: fix handling of common and differing noise seeds in SCEs for ISM DTX */
 #define NONBE_FIX_913_OMASA_BITBUDGET_VIOLATION               /* VA/Nok: issue 913: Resolve "Crash in OMASA encoder - DFT-Stereo bit-budget violated" */
-
+#define NONBE_FIX_855_JBM_FLUSH_OFFSET                        /* FhG: issue #855: add missing switch here for the code in JBM flushing                 */
 
 /* ##################### End NON-BE switches ########################### */
 
diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c
index f5b5d5d08a06d897f5ef513d60d53e6ed1fc1721..a2eb9b08fccc1ee8b79601e793e8bfc99ecf1fb3 100644
--- a/lib_dec/ivas_jbm_dec.c
+++ b/lib_dec/ivas_jbm_dec.c
@@ -1706,7 +1706,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;
@@ -1865,7 +1865,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
     }