diff --git a/lib_com/options.h b/lib_com/options.h
index 1ed9f1662cbc370f047bb3446cccc9ba67df9e8a..cf016659dadd0463a03c3b7f1af8f921df038de5 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -164,6 +164,7 @@
 #define FIX_1831_REVERB_REGRESSION                      /* Philips: fixes reverb regression issues  */
 #define FIX_1835_REVERB_ACTIVATION                      /* FhG: Modified reverberation activation logic and corrected factEQ calculation */
 #define NON_BE_FIX_EVS_USAN_ERR_IN_WAVEADJUST           /* FhG: address issue 1037 */
+#define FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI      /* FhG: move setting of pointers for parameter decoding so they are skipped in lost frames when they are not needed */
 
 /* #################### End BASOP porting switches ############################ */
 
diff --git a/lib_dec/dec_LPD_fx.c b/lib_dec/dec_LPD_fx.c
index b638a36e55bbc3de081e4667c74e8cc8c5be9b66..03cc8b3ce6875efc4b22c2979ad5b095e200a319 100644
--- a/lib_dec/dec_LPD_fx.c
+++ b/lib_dec/dec_LPD_fx.c
@@ -718,12 +718,20 @@ void decoder_LPD_fx(
         FOR( k = 0; k < 2; k++ )
         {
 
+#ifndef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
             /* Set pointer to parameters */
             prm = param + ( k * DEC_NPRM_DIV );
 
             /* Stability Factor */
+#endif
             IF( bfi == 0 )
             {
+#ifdef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
+                /* Set pointer to parameters */
+                prm = param + ( k * DEC_NPRM_DIV );
+
+                /* Stability Factor */
+#endif
                 st->stab_fac_fx = lsf_stab_fx( &lsf[( ( k + 1 ) ) * M], &lsf[k * M], 0, L_FRAME );
                 move16();
             }
diff --git a/lib_dec/dec_tcx_fx.c b/lib_dec/dec_tcx_fx.c
index 8009c69e011123ec9161741f2c1d18379e427e18..508112d0c28ccd00ed69dbaee14dd2e318783b04 100644
--- a/lib_dec/dec_tcx_fx.c
+++ b/lib_dec/dec_tcx_fx.c
@@ -4411,7 +4411,15 @@ void decoder_tcx_invQ_fx(
 
     tnsSize = 0;
     move16();
+#ifndef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
     prm_target = NULL; /* just to suppress MSVC warnigs */
+#else
+    /* just to suppress MSVC warnigs */
+    prm_target = NULL;
+    prm_ltp = NULL;
+    prm_tns = NULL;
+    prm_sqQ = NULL;
+#endif
 
     /*-----------------------------------------------------------------*
      * Initializations
@@ -4435,8 +4443,10 @@ void decoder_tcx_invQ_fx(
         move16();
     }
 
+#ifndef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
     prm_ltp = &prm[1 + NOISE_FILL_RANGES];
     prm_tns = prm_ltp + LTPSIZE;
+#endif
 
     gainCompensate = ONE_IN_Q14;
     move16();
@@ -4452,6 +4462,10 @@ void decoder_tcx_invQ_fx(
 
     IF( !bfi )
     {
+#ifdef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
+        prm_ltp = &prm[1 + NOISE_FILL_RANGES];
+        prm_tns = prm_ltp + LTPSIZE;
+#endif
         index = prm[0];
         move16();
 
@@ -4473,9 +4487,11 @@ void decoder_tcx_invQ_fx(
         move16();
     }
 
+#ifndef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
     prm_hm = prm_tns + tnsSize;
     prm_sqQ = prm_hm + NPRM_CTX_HM;
     *prm_sqQ1 = prm_sqQ;
+#endif
 
     /*-----------------------------------------------------------*
      * Spectrum data                                             *
@@ -4483,6 +4499,11 @@ void decoder_tcx_invQ_fx(
 
     IF( !bfi )
     {
+#ifdef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
+        prm_hm = prm_tns + tnsSize;
+        prm_sqQ = prm_hm + NPRM_CTX_HM;
+        *prm_sqQ1 = prm_sqQ;
+#endif
         /*-----------------------------------------------------------*
          * Context HM                                                *
          *-----------------------------------------------------------*/