diff --git a/lib_com/options.h b/lib_com/options.h
index 09025f757a2939d98ff3d9d29b69a4a4e172ba65..09300d64f7d59afe202b47e3bf508583a9f41d2a 100755
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -151,6 +151,7 @@
 #define FIX_ISSUE_1966_F0_32BIT                         /* FhG: Basop issue 1966: use 32-bit variables for F0 and thresholdModification */
 #define FIX_BASOP_2519_TCA_LA_ZERO_EXP                  /* FhG: BASOP #2519: Exclude zero samples from exp_com calculation in tcaTargetCh_LA_fx */
 #define FIX_BASOP_2519_ICBWE_DEC_Q_TRACK                /* FhG: BASOP #2519: Track Q-format of dec_2over3_mem_fx across frames in stereo_icBWE_preproc_fx */
+#define FIX_BASOP_2592_OVERFLOW                         /* FhG: BASOP #2592: fix overflow in GetF0() */
 
 /* ##################### End NON-BE switches ########################### */
 
diff --git a/lib_dec/TonalComponentDetection_fx.c b/lib_dec/TonalComponentDetection_fx.c
index b5718956cb3d4483947cc4867fc8e71265f1030c..900a0982501fe6cb89d1fa2f84730b1a1af8751c 100644
--- a/lib_dec/TonalComponentDetection_fx.c
+++ b/lib_dec/TonalComponentDetection_fx.c
@@ -473,7 +473,11 @@ static void GetF0(
         {
             Word16 tmp_32 = 0;
             Word32 F0_32 = BASOP_Util_Divide3232_Scale_newton( L_shl( nSamplesCore, Q16 ), tmpPitchLag, &tmp_32 );
+#ifdef FIX_BASOP_2592_OVERFLOW
+            F0_32 = L_shl_sat( F0_32, tmp_32 - Q16 ); /* saturation needed to allow 0x40000000 << 1 */
+#else
             F0_32 = L_shl( F0_32, tmp_32 - Q16 );
+#endif
             *pF0_32 = F0_32;
             move32();
             *pOrigF0_32 = *pF0_32; /*Q26*/