diff --git a/ext/fdkaac/gstfdkaacdec.c b/ext/fdkaac/gstfdkaacdec.c
index 181bd22..5c958ea 100644
--- a/ext/fdkaac/gstfdkaacdec.c
+++ b/ext/fdkaac/gstfdkaacdec.c
@@ -155,13 +155,14 @@ gst_fdkaacdec_set_format (GstAudioDecoder * dec, GstCaps * caps)
     GST_ERROR_OBJECT (self, "Failed to set output channel mapping: %d", err);
     return FALSE;
   }
-
+#if 0
   if ((err =
           aacDecoder_SetParam (self->dec, AAC_PCM_OUTPUT_INTERLEAVED,
               0)) != AAC_DEC_OK) {
     GST_ERROR_OBJECT (self, "Failed to set output channel mapping: %d", err);
     return FALSE;
   }
+#endif
 
   /* 8 channels * 2 bytes per sample * 2048 samples */
   if (!self->decode_buffer) {
@@ -230,6 +231,8 @@ gst_fdkaacdec_handle_frame (GstAudioDecoder * dec, GstBuffer * inbuf)
 
     /* FIXME: Can this be simplified somehow? */
     for (i = 0; i < stream_info->numChannels; i++) {
+      if (stream_info->pChannelType[i] == ACT_NONE)
+        stream_info->pChannelType[i] = ACT_LFE;
       if (stream_info->pChannelType[i] == ACT_FRONT) {
         n_front++;
       } else if (stream_info->pChannelType[i] == ACT_SIDE) {
