diff --git a/lib_dec/lib_dec_fx.c b/lib_dec/lib_dec_fx.c
index 05fd52bfbb2ece80f382ad842ccacdb1a8f6ba49..9d1fb571c731311a5e3889bb0a0f3e7ee9cdd4b0 100644
--- a/lib_dec/lib_dec_fx.c
+++ b/lib_dec/lib_dec_fx.c
@@ -1090,7 +1090,7 @@ ivas_error IVAS_DEC_GetSamples(
             Word16 tmp_apaExecBuffer[APA_BUF];
             IF( EQ_16( (Word16) hIvasDec->mode, IVAS_DEC_MODE_EVS ) )
             {
-                FOR( Word16 i = 0; i < APA_BUF_PER_CHANNEL * nTransportChannels; ++i )
+                FOR( Word32 i = 0; i < APA_BUF_PER_CHANNEL * nTransportChannels; ++i )
                 {
                     tmp_apaExecBuffer[i] = extract_l( L_shr( hIvasDec->apaExecBuffer_fx[i], Q11 ) ); // Q0
                 }
@@ -1098,14 +1098,14 @@ ivas_error IVAS_DEC_GetSamples(
                 {
                     return IVAS_ERR_UNKNOWN;
                 }
-                FOR( Word16 i = 0; i < APA_BUF_PER_CHANNEL * nTransportChannels; ++i )
+                FOR( Word32 i = 0; i < APA_BUF_PER_CHANNEL * nTransportChannels; ++i )
                 {
                     hIvasDec->apaExecBuffer_fx[i] = L_shl( tmp_apaExecBuffer[i], Q11 ); // Q11
                 }
             }
             ELSE
             {
-                FOR( Word16 i = 0; i < APA_BUF_PER_CHANNEL * nTransportChannels; ++i )
+                FOR( Word32 i = 0; i < APA_BUF_PER_CHANNEL * nTransportChannels; ++i )
                 {
                     tmp_apaExecBuffer[i] = extract_l( L_shr( hIvasDec->apaExecBuffer_fx[i], Q12 ) ); // Q(-1)
                 }
@@ -1114,7 +1114,7 @@ ivas_error IVAS_DEC_GetSamples(
                     return IVAS_ERR_UNKNOWN;
                 }
 
-                FOR( Word16 i = 0; i < APA_BUF_PER_CHANNEL * nTransportChannels; ++i )
+                FOR( Word32 i = 0; i < APA_BUF_PER_CHANNEL * nTransportChannels; ++i )
                 {
                     hIvasDec->apaExecBuffer_fx[i] = L_shl( tmp_apaExecBuffer[i], Q12 ); // Q11
                 }