diff --git a/js/wysiwyg-media.js b/js/wysiwyg-media.js
index 97697f0..71dd691 100644
--- a/js/wysiwyg-media.js
+++ b/js/wysiwyg-media.js
@@ -54,7 +54,11 @@ Drupal.wysiwyg.plugins.media = {
     // But until then, we're just going to embed to img.
     // This is pretty hacked for now.
     //
-    var imgElement = $(this.stripDivs(formattedMedia));
+    var imgElement, re = /</;
+    if(re.test(formattedMedia))
+	imgElement = $(formattedMedia);
+    else
+	imgElement = $('<span />').text(formattedMedia);
     this.addImageAttributes(imgElement, mediaFile.fid, viewMode, options);
 
     var toInsert = this.outerHTML(imgElement);