--- a/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp
+++ b/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp
@@ -2080,20 +2080,24 @@ JsepSessionImpl::ValidateAnswer(const Sd
                              "attribute at level " << i << " ("
                              << ansExt.extensionname << "). Offer had "
                              << offExt.direction << ", answer had "
                              << ansExt.direction << ".");
               // return NS_ERROR_INVALID_ARG;
             }
 
             if (offExt.entry < 4096 && (offExt.entry != ansExt.entry)) {
-              JSEP_SET_ERROR("Answer changed id for extmap attribute at level "
-                             << i << " (" << offExt.extensionname << ") from "
-                             << offExt.entry << " to " << ansExt.entry << ".");
-              return NS_ERROR_INVALID_ARG;
+              // FIXME we do not return an error here, because Cisco Spark
+              // actually does respond with different extension ID's then we
+              // offer. See bug 1361206 for details.
+              MOZ_MTLOG(ML_WARNING, "Answer changed id for extmap attribute at"
+                        " level " << i << " (" << offExt.extensionname << ") "
+                        "from " << offExt.entry << " to "
+                        << ansExt.entry << ".");
+              // return NS_ERROR_INVALID_ARG;
             }
 
             if (ansExt.entry >= 4096) {
               JSEP_SET_ERROR("Answer used an invalid id (" << ansExt.entry
                              << ") for extmap attribute at level " << i
                              << " (" << ansExt.extensionname << ").");
               return NS_ERROR_INVALID_ARG;
             }