diff --git a/ext/smoothstreaming/gstmssdemux.c b/ext/smoothstreaming/gstmssdemux.c
index e6166f23ce..8127a4db93 100644
--- a/ext/smoothstreaming/gstmssdemux.c
+++ b/ext/smoothstreaming/gstmssdemux.c
@@ -954,27 +954,42 @@ gst_mss_demux_reconfigure (GstMssDemux * mssdemux)
   GSList *oldpads = NULL;
   GSList *iter;
   guint64 new_bitrate;
+  gboolean changed = FALSE;
 
   /* TODO lock? */
 
   if (!gst_mss_demux_all_streams_have_data (mssdemux))
     return;
 
-  new_bitrate =
-      mssdemux->bitrate_limit * gst_mss_demux_get_download_bitrate (mssdemux);
-  if (mssdemux->connection_speed) {
-    new_bitrate = MIN (mssdemux->connection_speed, new_bitrate);
+  gst_mss_demux_stop_tasks (mssdemux, TRUE);
+  for (iter = mssdemux->streams; iter; iter = g_slist_next (iter)) {
+    GstMssDemuxStream *stream;
+
+    stream = iter->data;
+
+    new_bitrate =
+        mssdemux->bitrate_limit *
+        gst_download_rate_get_current_rate (&stream->download_rate);
+    if (mssdemux->connection_speed) {
+      new_bitrate = MIN (mssdemux->connection_speed, new_bitrate);
+    }
+
+    GST_DEBUG_OBJECT (mssdemux, "Current stream %s download bitrate %llu",
+        GST_PAD_NAME (stream->pad), new_bitrate);
+
+    if (gst_mss_stream_select_bitrate (stream->manifest_stream, new_bitrate)) {
+      changed = TRUE;
+      GST_INFO_OBJECT (mssdemux, "Stream %s changed bitrate to %llu",
+          GST_PAD_NAME (stream->pad),
+          gst_mss_stream_get_current_bitrate (stream->manifest_stream));
+    }
   }
 
-  GST_DEBUG_OBJECT (mssdemux, "Current suggested bitrate: %llu", new_bitrate);
-
-  gst_mss_demux_stop_tasks (mssdemux, TRUE);
-  if (gst_mss_manifest_change_bitrate (mssdemux->manifest, new_bitrate)) {
+  if (changed) {
     GstClockTime newseg_ts = GST_CLOCK_TIME_NONE;
 
-    GST_INFO_OBJECT (mssdemux, "Switching to bitrate %llu", new_bitrate);
-
-    GST_DEBUG_OBJECT (mssdemux, "Creating new pad group");
+    GST_DEBUG_OBJECT (mssdemux,
+        "Bitrates have changed, creating new pad group");
     /* if we changed the bitrate, we need to add new pads */
     for (iter = mssdemux->streams; iter; iter = g_slist_next (iter)) {
       GstMssDemuxStream *stream = iter->data;
diff --git a/ext/smoothstreaming/gstmssmanifest.c b/ext/smoothstreaming/gstmssmanifest.c
index 56d670a7cc..9eaa81081b 100644
--- a/ext/smoothstreaming/gstmssmanifest.c
+++ b/ext/smoothstreaming/gstmssmanifest.c
@@ -992,7 +992,7 @@ gst_mss_manifest_reload_fragments (GstMssManifest * manifest, GstBuffer * data)
   xmlFreeDoc (xml);
 }
 
-static gboolean
+gboolean
 gst_mss_stream_select_bitrate (GstMssStream * stream, guint64 bitrate)
 {
   GList *iter = stream->current_quality;
@@ -1031,6 +1031,17 @@ gst_mss_stream_select_bitrate (GstMssStream * stream, guint64 bitrate)
   return TRUE;
 }
 
+guint64
+gst_mss_stream_get_current_bitrate (GstMssStream * stream)
+{
+  GstMssStreamQuality *q;
+  if (stream->current_quality == NULL)
+    return 0;
+
+  q = stream->current_quality->data;
+  return q->bitrate;
+}
+
 /**
  * gst_mss_manifest_change_bitrate:
  * @manifest: the manifest
diff --git a/ext/smoothstreaming/gstmssmanifest.h b/ext/smoothstreaming/gstmssmanifest.h
index 982f32d501..825b0821ec 100644
--- a/ext/smoothstreaming/gstmssmanifest.h
+++ b/ext/smoothstreaming/gstmssmanifest.h
@@ -52,6 +52,8 @@ void gst_mss_manifest_reload_fragments (GstMssManifest * manifest, GstBuffer * d
 
 GstMssStreamType gst_mss_stream_get_type (GstMssStream *stream);
 GstCaps * gst_mss_stream_get_caps (GstMssStream * stream);
+gboolean gst_mss_stream_select_bitrate (GstMssStream * stream, guint64 bitrate);
+guint64 gst_mss_stream_get_current_bitrate (GstMssStream * stream);
 void gst_mss_stream_set_active (GstMssStream * stream, gboolean active);
 guint64 gst_mss_stream_get_timescale (GstMssStream * stream);
 GstFlowReturn gst_mss_stream_get_fragment_url (GstMssStream * stream, gchar ** url);