diff --git a/docroot/sites/all/modules/contrib/media/js/media.filter.js b/docroot/sites/all/modules/contrib/media/js/media.filter.js
index 29936fd..f6ff736 100644
--- a/docroot/sites/all/modules/contrib/media/js/media.filter.js
+++ b/docroot/sites/all/modules/contrib/media/js/media.filter.js
@@ -113,6 +113,22 @@
      *    A object containing the media file information (fid, view_mode, etc).
      */
     create_element: function (html, info) {
+      // Media breaks with multivalue fields on clicking "Add new value".
+      // Trick to avoid this
+      // Check if html is an array
+      if ($.isArray(html)) {
+        // Get current instance
+        var instanceId = Drupal.wysiwyg.activeId;
+        // Field name
+        var name = $('#' + instanceId).attr('name');
+        // Get field index
+        var pattern = /\[([0-9]*)\]/;
+        var fieldIndex = name.match(pattern);
+        if (fieldIndex.length > 0) {
+          fieldIndex = [fieldIndex.length-1];
+          html = html[fieldIndex];
+        }
+      }
       if ($('<div></div>').append(html).text().length === html.length) {
         // Element is not an html tag. Surround it in a span element
         // so we can pass the file attributes.