diff --git a/lib_com/options.h b/lib_com/options.h
index b776da9f62a11cdb4db84e86e642683fc909732a..6b2998e3de454d0963569468fb349da4d42883b4 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -184,6 +184,7 @@
 #define FIX_WARNING_RENDER_CONFIG                       /* Orange: fix warning on windows build */
 #define NONBE_FIX_991_PARAMBIN_BINARY_HRTF              /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to actiate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on  )*/
 #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 */
 
 #define NONBE_FIX_984_OMASA_EXT_OUTPUT                  /* Nok: issue 1497 - porting OMASA EXT MR   */
 /* #################### End BASOP porting switches ############################ */
diff --git a/lib_dec/dec_LPD.c b/lib_dec/dec_LPD.c
index 9bc22f4b5e4e493411b05338131022e0744077af..1ce388ce9586f9b8da2d560f9f5d7f63ea9a4bbf 100644
--- a/lib_dec/dec_LPD.c
+++ b/lib_dec/dec_LPD.c
@@ -604,12 +604,20 @@ void decoder_LPD(
 
         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 )
             {
+#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 = lsf_stab( &lsf[( k + 1 ) * M], &lsf[k * M], 0, st->L_frame );
             }
 
diff --git a/lib_dec/dec_tcx.c b/lib_dec/dec_tcx.c
index fbe24112827c066ce6d1fa1de4e7d37eb8e21940..554c4a4bda6f0989c71ca3ad91ba6add7cc5445d 100644
--- a/lib_dec/dec_tcx.c
+++ b/lib_dec/dec_tcx.c
@@ -93,6 +93,9 @@ void decoder_tcx(
     tmp_concealment_method = 0;
     nf_seed = 0;
     fUseTns = 0; /* flag that is set if TNS data is present */
+#ifdef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
+    prm_sqQ = NULL;
+#endif
 
     set_f( xn_buf, 0, L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX );
 
@@ -730,7 +733,15 @@ void decoder_tcx_invQ(
     TCX_CONFIG_HANDLE hTcxCfg = st->hTcxCfg;
 
     tnsSize = 0;
+#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
@@ -750,8 +761,10 @@ void decoder_tcx_invQ(
         noiseFillingSize = st->hIGFDec->infoIGFStartLine;
     }
 
+#ifndef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
     prm_ltp = &prm[1 + NOISE_FILL_RANGES];
     prm_tns = prm_ltp + LTPSIZE;
+#endif
 
     /*-----------------------------------------------------------*
      * Read TCX parameters                                       *
@@ -762,7 +775,10 @@ void decoder_tcx_invQ(
     if ( !bfi )
     {
         index = prm[0];
-
+#ifdef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
+        prm_ltp = &prm[1 + NOISE_FILL_RANGES];
+        prm_tns = prm_ltp + LTPSIZE;
+#endif
         /* read noise level (fac_ns) */
         st->hTcxDec->noise_filling_index[frame_cnt] = prm[1];
     }
@@ -777,9 +793,11 @@ void decoder_tcx_invQ(
         *fUseTns = 0;
     }
 
+#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                                             *
@@ -787,6 +805,11 @@ void decoder_tcx_invQ(
 
     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                                                *
          *-----------------------------------------------------------*/