diff --git a/lib_com/options.h b/lib_com/options.h
index 0000a66f49268907a8e5fdba56873a3e85642984..e6081dee4f287d5e9ea6ccb79bcf223651998ea0 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -164,6 +164,7 @@
 /*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */
 #define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */
 #define FIX_1348_OVERFLOW                               /* FhG: fix BASOP overflow in hq_lr_dec(), brings floating-point code inline with FX */
+#define FIX_1369_HQ_LR_OVERFLOW                         /* FhG: fix BASOP overflow in hq_lr_enc(), brings floating-point code inline with FX */
 
 /* #################### End BE switches ################################## */
 
diff --git a/lib_enc/hq_lr_enc.c b/lib_enc/hq_lr_enc.c
index 65b5dd4ef5b3a37deeae00c7a6a382ad2ae8f416..be0a2254c5ecb1dee68c0d425086d6f275ffd813 100644
--- a/lib_enc/hq_lr_enc.c
+++ b/lib_enc/hq_lr_enc.c
@@ -336,7 +336,15 @@ void hq_lr_enc(
         frac1 = L_Extract_lc( L_tmp, &exp ); /* Extract exponent of L_tmp */
         L_tmp = Pow2( 30, frac1 );
         exp = sub( exp, 30 );
-        Ep_fx[i] = L_shl( L_tmp, sub( exp, 6 ) ); /* Q -6 */
+#ifdef FIX_1369_HQ_LR_OVERFLOW
+#ifdef BASOP_NOGLOB
+        Ep_fx[i] = L_shl_o( L_tmp, s_max( sub( exp, 6 ), -31 ), &Overflow ); /* Q -6 */
+#else
+        Ep_fx[i] = L_shl( L_tmp, s_max( sub( exp, 6 ), -31 ) ); /* Q -6 */
+#endif
+#else
+        Ep_fx[i] = L_shl( L_tmp, sub( exp, 6 ) );                        /* Q -6 */
+#endif
         Ep[i] = (float) ( Ep_fx[i] / pow( 2.0, -6 ) );
     }