diff --git a/talk/session/media/mediasession.cc b/talk/session/media/mediasession.cc
index d4ab1f6..7a5d6ac 100644
--- a/talk/session/media/mediasession.cc
+++ b/talk/session/media/mediasession.cc
@@ -1185,8 +1185,8 @@
           return NULL;
         }
         video_added = true;
-      } else if (options.has_data()) {
-        ASSERT(IsMediaContentOfType(&*it, MEDIA_TYPE_DATA));
+      } else if (IsMediaContentOfType(&*it, MEDIA_TYPE_DATA) &&
+                 options.has_data()) {
         if (!AddDataContentForOffer(options, current_description, &data_codecs,
                                     &current_streams, offer.get())) {
           return NULL;