diff --git a/app.js b/app.js
index 93ec61035..73ab11a32 100644
--- a/app.js
+++ b/app.js
@@ -232,7 +232,7 @@ $(document).bind('remotestreamadded.jingle', function (event, data, sid) {
     if (data.stream.id.indexOf('mixedmslabel') === -1) {
         var ssrclines = SDPUtil.find_lines(sess.peerconnection.remoteDescription.sdp, 'a=ssrc');
         ssrclines = ssrclines.filter(function (line) {
-            return line.indexOf('mslabel:' + data.stream.label) !== -1;
+            return line.indexOf('msid:' + data.stream.id) !== -1;
         });
         if (ssrclines.length) {
             thessrc = ssrclines[0].substring(7).split(' ')[0];
diff --git a/libs/colibri/colibri.focus.js b/libs/colibri/colibri.focus.js
index 6c53a29d2..7c7e56aba 100644
--- a/libs/colibri/colibri.focus.js
+++ b/libs/colibri/colibri.focus.js
@@ -128,7 +128,7 @@ ColibriFocus.prototype.makeConference = function (peers) {
     this.peerconnection.onaddstream = function (event) {
         // search the jid associated with this stream
         Object.keys(self.remotessrc).forEach(function (jid) {
-            if (self.remotessrc[jid].join('\r\n').indexOf('mslabel:' + event.stream.id) != -1) {
+            if (self.remotessrc[jid].join('\r\n').indexOf('msid:' + event.stream.id) != -1) {
                 event.peerjid = jid;
             }
         });