diff --git a/includes/media.filter.inc b/includes/media.filter.inc
index 32424df..97c5691 100644
--- a/includes/media.filter.inc
+++ b/includes/media.filter.inc
@@ -173,7 +173,7 @@ function media_token_to_markup($match, $wysiwyg = FALSE) {
     // Track the fid of this file in the {media_filter_usage} table.
     media_filter_track_usage($file->fid);
 
-    $attributes = is_array($tag_info['attributes']) ? $tag_info['attributes'] : array();
+    $attributes = (isset($tag_info['attributes']) && is_array($tag_info['attributes'])) ? $tag_info['attributes'] : array();
     $attribute_whitelist = media_variable_get('wysiwyg_allowed_attributes');
     $settings['attributes'] = array_intersect_key($attributes, array_flip($attribute_whitelist));
 
diff --git a/includes/media.types.inc b/includes/media.types.inc
index 0561042..b36ed38 100644
--- a/includes/media.types.inc
+++ b/includes/media.types.inc
@@ -42,9 +42,8 @@ function media_file_type_info_alter(array &$info) {
  * display.
  */
 function media_file_type_media_default_view($file, $view_mode, $langcode) {
-  // During preview, or when custom attribute values are needed on the displayed
-  // element, use a media icon.
-  if ($view_mode == 'media_preview' || isset($file->override)) {
+  // During preview use a media icon.
+  if ($view_mode == 'media_preview') {
     return array(
       '#theme' => 'media_formatter_large_icon',
       '#file' => $file,