diff --git a/lib_com/options.h b/lib_com/options.h
index 0283dc7b21bcdaf4dc33a217b2e8455fffc6dbe5..757a4c24fc7390c46c36d6a4db137392c03c33e8 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -214,6 +214,7 @@
 #define NONBE_1214_PLC_LSF_MEMORY                       /* VA: issue 1224: reset ACELP PLC FEC memory in case of switching from MDCT stereo to TD/DFT stereo */
 #define NONBE_1293_SR_HRTF                              /* VA: issue 1293: add support of external HRTFs in split rendering */
 #define NONBE_1220_OMASA_JBM_BRATE_SW_FLUSH             /* VA: issue 1220: fix bug in renderer flush in OMASA 1ISM JBM bitrate switching */
+#define FIX_1369_HQ_LR_OVERFLOW                         /* FhG: fix BASOP overflow in hq_lr_enc(), brings floating-point code inline with FX */
 
 /* #################### End BASOP porting switches ############################ */
 
diff --git a/lib_enc/hq_lr_enc.c b/lib_enc/hq_lr_enc.c
index acafddc16f771a5874cf48cff77bf2a023a7f441..c0b43f7794a22edd57cbacad89c9e77513dd840c 100644
--- a/lib_enc/hq_lr_enc.c
+++ b/lib_enc/hq_lr_enc.c
@@ -334,7 +334,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 );
+#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 ) );
     }