diff --git a/lib_dec/gain_dec_fx.c b/lib_dec/gain_dec_fx.c
index 6f490b89fa0d2dd613d1cf04552f43dbd5575c66..5e17122311bc97e7495aa9840fa7036d069b3c24 100644
--- a/lib_dec/gain_dec_fx.c
+++ b/lib_dec/gain_dec_fx.c
@@ -505,22 +505,34 @@ void gain_dec_mless_fx(
 
         L_tmp = Dot_product12( code_fx, code_fx, L_SUBFR, &expg ); /*Q31 - expg*/
         expg = sub( expg, 18 + 6 );                                /* exp: -18 (code in Q9), -6 (/L_SUBFR) */
-        expg2 = expg;
-        move16();
-        L_tmp1 = L_tmp; /* sets to 'L_tmp' in 1 clock */
-        move32();
-        L_tmp = Isqrt_lc( L_tmp, &expg ); /*Q31 - expg*/
-
-        *gain_inov_fx = extract_h( L_shl( L_tmp, sub( expg, 3 ) ) ); /* gain_inov in Q12 */
-        move16();
-
-        /*Ei = 10 * (float)log10( Ecode );*/
-        e_tmp = norm_l( L_tmp1 );
-        f_tmp = Log2_norm_lc( L_shl( L_tmp1, e_tmp ) ); /*Q15*/
-        e_tmp = sub( expg2, add( 1, e_tmp ) );
-        L_tmp1 = Mpy_32_16( e_tmp, f_tmp, 12330 ); /* Q13 */ /* 10*log10(2) in Q12*/
-        Ei_fx = round_fx( L_shl( L_tmp1, 11 ) );             /* Q8 */
 
+        // To avoid crash in case code value is 0
+        IF( EQ_16( BASOP_Util_Cmp_Mant32Exp( L_tmp, expg, 21474836, 0 ), -1 ) )
+        {
+            // setting values to avoid extra computation
+            *gain_inov_fx = 32767; /*8(max value gain_inov can hold) in Q12*/
+            Ei_fx = -9743;         /* -38 in Q8*/
+            move16();
+            move16();
+        }
+        ELSE
+        {
+            expg2 = expg;
+            move16();
+            L_tmp1 = L_tmp; /* sets to 'L_tmp' in 1 clock */
+            move32();
+            L_tmp = Isqrt_lc( L_tmp, &expg ); /*Q31 - expg*/
+
+            *gain_inov_fx = extract_h( L_shl( L_tmp, sub( expg, 3 ) ) ); /* gain_inov in Q12 */
+            move16();
+
+            /*Ei = 10 * (float)log10( Ecode );*/
+            e_tmp = norm_l( L_tmp1 );
+            f_tmp = Log2_norm_lc( L_shl( L_tmp1, e_tmp ) ); /*Q15*/
+            e_tmp = sub( expg2, add( 1, e_tmp ) );
+            L_tmp1 = Mpy_32_16( e_tmp, f_tmp, 12330 ); /* Q13 */ /* 10*log10(2) in Q12*/
+            Ei_fx = round_fx( L_shl( L_tmp1, 11 ) );             /* Q8 */
+        }
         /*-----------------------------------------------------------------*
          * calculate the predicted gain code
          *-----------------------------------------------------------------*/
diff --git a/lib_enc/gain_enc_fx.c b/lib_enc/gain_enc_fx.c
index e0fbcf2c366d94c75f8fc10942286fedbb8b8b19..162fc41fa62738ea3379513ff32d59279984efc9 100644
--- a/lib_enc/gain_enc_fx.c
+++ b/lib_enc/gain_enc_fx.c
@@ -603,40 +603,43 @@ void gain_enc_mless_ivas_fx(
     L_tmp = Dot_product12( code, code, L_SUBFR, &exp_code );
     exp_inov = sub( exp_code, 18 + 6 );
 
-    // To avoid crash in case code value is 0
+    // To avoid crash in case code value is 0,
     IF( EQ_16( BASOP_Util_Cmp_Mant32Exp( L_tmp, exp_inov, 21474836, 0 ), -1 ) )
     {
-        L_tmp = 21474836;
-        exp_inov = 0;
-        move32();
+        // setting values to avoid extra computation
+        *gain_inov = 32767; /*8(max value gain_inov can hold) in Q12*/
+        Ei = -9743;         /* -38 in Q8*/
+        move16();
         move16();
     }
+    ELSE
+    {
+        exp_code = sub( exp_code, 30 );
 
-    exp_code = sub( exp_code, 30 );
-
-    /*Ei = 10 * log10((dot_product(code, code, L_SUBFR) + 0.01) / L_SUBFR) */
+        /*Ei = 10 * log10((dot_product(code, code, L_SUBFR) + 0.01) / L_SUBFR) */
 
-    /*----------------------------------------------------------------*
-     * calculate the predicted gain code
-     *----------------------------------------------------------------*/
-    tmp = norm_l( L_tmp );
-    frac = Log2_norm_lc( L_shl( L_tmp, tmp ) );
-    tmp = add( 30 - 18 - 6 - 1, sub( exp_code, tmp ) ); /* exp: -18 (code in Q9), -6 (/L_SUBFR) */
-    L_tmp1 = Mpy_32_16( tmp, frac, 12330 );             /* Q13 */
-    Ei = round_fx( L_shl( L_tmp1, 11 ) );               /* Q8 */
+        /*----------------------------------------------------------------*
+         * calculate the predicted gain code
+         *----------------------------------------------------------------*/
+        tmp = norm_l( L_tmp );
+        frac = Log2_norm_lc( L_shl( L_tmp, tmp ) );
+        tmp = add( 30 - 18 - 6 - 1, sub( exp_code, tmp ) ); /* exp: -18 (code in Q9), -6 (/L_SUBFR) */
+        L_tmp1 = Mpy_32_16( tmp, frac, 12330 );             /* Q13 */
+        Ei = round_fx( L_shl( L_tmp1, 11 ) );               /* Q8 */
+
+        /*---------------------------------------------------------------*
+         * Decode codebook gain and the adaptive excitation low-pass
+         * filtering factor (Finalize computation )
+         *---------------------------------------------------------------*/
+        /* gain_inov = 1.0f / sqrt((dot_product(code, code, L_SUBFR) + 0.01) / L_SUBFR) */
+        L_tmp = Isqrt_lc( L_tmp, &exp_inov );
+        *gain_inov = extract_h( L_shl( L_tmp, sub( exp_inov, 3 ) ) ); /* gain_inov in Q12 */
+        move16();
+    }
 
     /* predicted codebook gain */
     gcode0 = sub( Es_pred, Ei ); /* Q8 */
 
-    /*---------------------------------------------------------------*
-     * Decode codebook gain and the adaptive excitation low-pass
-     * filtering factor (Finalize computation )
-     *---------------------------------------------------------------*/
-    /* gain_inov = 1.0f / sqrt((dot_product(code, code, L_SUBFR) + 0.01) / L_SUBFR) */
-    L_tmp = Isqrt_lc( L_tmp, &exp_inov );
-    *gain_inov = extract_h( L_shl( L_tmp, sub( exp_inov, 3 ) ) ); /* gain_inov in Q12 */
-    move16();
-
     /* gcode0 = pow(10, 0.05 * (Es_pred - Ei)) */
     /*----------------------------------------------------------------*
      * gcode0 = pow(10.0, gcode0/20)