diff --git a/src/opus_encoder.c b/src/opus_encoder.c
index 3c496cc4080fa4c866e5fc55ffe92d843a225496..1bdc0fe470045a919f7390a289c40ff5af162847 100644
--- a/src/opus_encoder.c
+++ b/src/opus_encoder.c
@@ -580,8 +580,12 @@ int opus_encode_float(OpusEncoder *st, const opus_val16 *pcm, int frame_size,
 
        st->mode = (equiv_rate >= threshold) ? MODE_CELT_ONLY: MODE_SILK_ONLY;
 
+       /* When FEC is enabled and there's enough packet loss, use SILK */
        if (st->silk_mode.useInBandFEC && st->silk_mode.packetLossPercentage > (128-voice_est)>>4)
           st->mode = MODE_SILK_ONLY;
+       /* When encoding voice and DTX is enabled, set the encoder to SILK mode (at least for now) */
+       if (st->silk_mode.useDTX && voice_est > 100)
+          st->mode = MODE_SILK_ONLY;
 #endif
     } else {
        st->mode = st->user_forced_mode;