diff --git a/src/opus_multistream_decoder.c b/src/opus_multistream_decoder.c
index 47f87b193a40fd63a218f95bfa791ffcc060126e..495fb07e3a022cdd2ecf94503f1b3692c38b6d29 100644
--- a/src/opus_multistream_decoder.c
+++ b/src/opus_multistream_decoder.c
@@ -274,7 +274,7 @@ static void opus_copy_channel_out_float(
 )
 {
    float *float_dst;
-   int i;
+   opus_int32 i;
    float_dst = (float*)dst;
    if (src != NULL)
    {
@@ -303,7 +303,7 @@ static void opus_copy_channel_out_short(
 )
 {
    opus_int16 *short_dst;
-   int i;
+   opus_int32 i;
    short_dst = (opus_int16*)dst;
    if (src != NULL)
    {
diff --git a/src/opus_multistream_encoder.c b/src/opus_multistream_encoder.c
index 66c75ca118d7137e91094ad70e30dea64e7ae211..1847bd5ae6afea5264f61d20f0d9f04df06cc1ed 100644
--- a/src/opus_multistream_encoder.c
+++ b/src/opus_multistream_encoder.c
@@ -356,7 +356,7 @@ static void opus_copy_channel_in_float(
 )
 {
    const float *float_src;
-   int i;
+   opus_int32 i;
    float_src = (const float *)src;
    for (i=0;i<frame_size;i++)
 #if defined(FIXED_POINT)
@@ -377,7 +377,7 @@ static void opus_copy_channel_in_short(
 )
 {
    const opus_int16 *short_src;
-   int i;
+   opus_int32 i;
    short_src = (const opus_int16 *)src;
    for (i=0;i<frame_size;i++)
 #if defined(FIXED_POINT)