diff --git a/lib_com/options.h b/lib_com/options.h
index 95272a536476586c757eb0e7473cd5c4aecbc98e..bb95bfdafb1a67342d811f8924705d1713959e3c 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -96,6 +96,7 @@
 #define HARMONIZE_2598_tcx_arith_decode_envelope        /* FhG: harmonize tcx_arith_decode_envelope between EVS and IVAS versions */
 #define HARMONIZE_2598_tcx_arith_encode_envelope        /* FhG: harmonize tcx_arith_encode_envelope between EVS and IVAS versions */
 #define FIX_ISSUE_2594_FALSE_COMMENT                    /* FhG: basop issue 2594: fixing false comments about Q value*/
+#define FIX_ISSUE_2617_WRONG_INSTR                      /* FhG: basop issue 2617: Instrumentation misuse in function unclr_classifier_dft_fx*/
 
 /* #################### End BE switches ################################## */
 
diff --git a/lib_enc/ivas_stereo_classifier_fx.c b/lib_enc/ivas_stereo_classifier_fx.c
index 5ab5f221377533ba012ccfdad667b211a45ddfd9..35453cd5b170728e354dec731080c8efeda71768 100644
--- a/lib_enc/ivas_stereo_classifier_fx.c
+++ b/lib_enc/ivas_stereo_classifier_fx.c
@@ -1067,7 +1067,11 @@ void unclr_classifier_dft_fx(
     ELSE
     {
         relE_ST = hStereoClassif->relE_buf_fx[0];
+#ifndef FIX_ISSUE_2617_WRONG_INSTR
         move16();
+#else
+        move32();
+#endif // !FIX_ISSUE_2617_WRONG_INSTR
     }
 
     IF( GT_32( hStereoClassif->relE_0_1_fx, relE_ST ) )