diff --git a/includes/media.filter.inc b/includes/media.filter.inc
index 5f2c82e..12e08c2 100644
--- a/includes/media.filter.inc
+++ b/includes/media.filter.inc
@@ -200,6 +200,9 @@ function media_token_to_markup($match, $wysiwyg = FALSE) {
   }
 
   $element = media_get_file_without_label($file, $tag_info['view_mode'], $settings);
+  if ($wysiwyg == TRUE) {
+    $element = media_get_file_without_label($file, 'preview', $settings);
+  }
   return drupal_render($element);
 }
 
diff --git a/js/wysiwyg-media.js b/js/wysiwyg-media.js
index 97697f0..731d56d 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 = $(this.stripDivs(mediaFile.preview));
+
+    if (mediaFile.type == "image") {
+      imgElement = $(this.stripDivs(formattedMedia));
+    }
     this.addImageAttributes(imgElement, mediaFile.fid, viewMode, options);
 
     var toInsert = this.outerHTML(imgElement);