diff --git a/apps/decoder.c b/apps/decoder.c
index 6edb2e1eaccdf91d986d1a4b7f3295fca0cdd41e..752fc401d12799cc534522f71dc3d1c5eb62a21e 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -3604,7 +3604,7 @@ static ivas_error decodeVoIP(
 #ifdef SUPPORT_JBM_TRACEFILE
                 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, &bitstreamReadDone, &nSamplesRendered, &parameterAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )
+                if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, &bitstreamReadDone, &nSamplesRendered, &parametersAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )
 #endif
                 {
                     fprintf( stderr, "\nError in IVAS_DEC_VoIP_GetSamples: %s\n", IVAS_DEC_GetErrorMessage( error ) );
diff --git a/lib_com/options.h b/lib_com/options.h
index 5c079fce2cc95976007f99cb6aca5453e324be0a..6d9d98192d4f87e54492ddad3e63b8d410068ef7 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -40,7 +40,9 @@
 /* clang-format off */
   /* ################### Start compiler switches ######################## */
 
+#ifndef NO_SUPPORT_JBM_TRACEFILE
 #define SUPPORT_JBM_TRACEFILE                   /* support for JBM tracefile, which is needed for 3GPP objective/subjective testing, but not relevant for real-world implementations */
+#endif
 
 /* #################### End compiler switches ######################### */