diff --git a/src/opus_decoder.c b/src/opus_decoder.c
index f2e173bb09e0ccb416b47d85cf58945d15658419..a022840c3673a27a0acb4891020c1b615a0483c6 100644
--- a/src/opus_decoder.c
+++ b/src/opus_decoder.c
@@ -442,7 +442,10 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
     	            st->channels, window, st->Fs);
     }
 
-    st->rangeFinal = dec.rng ^ redundant_rng;
+    if (len <= 1)
+       st->rangeFinal = 0;
+    else
+       st->rangeFinal = dec.rng ^ redundant_rng;
 
     st->prev_mode = mode;
     st->prev_redundancy = redundancy;
diff --git a/src/opus_encoder.c b/src/opus_encoder.c
index 1b00a270bc795695fca3953024da70b3b307a1a8..e90472fa4688293ec7177aca9959ec4cf08839f8 100644
--- a/src/opus_encoder.c
+++ b/src/opus_encoder.c
@@ -261,6 +261,7 @@ int opus_encode_float(OpusEncoder *st, const opus_val16 *pcm, int frame_size,
     opus_uint32 redundant_rng = 0;
     ALLOC_STACK;
 
+    st->rangeFinal = 0;
     if (400*frame_size != st->Fs && 200*frame_size != st->Fs && 100*frame_size != st->Fs &&
          50*frame_size != st->Fs &&  25*frame_size != st->Fs &&  50*frame_size != 3*st->Fs)
         return OPUS_BAD_ARG;