diff --git a/includes/media.filter.inc b/includes/media.filter.inc
index b8f8065..401f4d6 100644
--- a/includes/media.filter.inc
+++ b/includes/media.filter.inc
@@ -176,6 +176,7 @@ function media_token_to_markup($match, $wysiwyg = FALSE) {
     $element['#attributes']['data-file_info'] = urlencode($data);
     $element['#attributes']['class'][] = 'media-element';
   }
+  // Markup is being rendered for the page
   else {
     // Display the field elements.
     $element = array();
@@ -191,20 +192,16 @@ function media_token_to_markup($match, $wysiwyg = FALSE) {
     field_attach_prepare_view('file', array($file->fid => $file), $tag_info['view_mode']);
     entity_prepare_view('file', array($file->fid => $file));
     $element['content'] += field_attach_view('file', $file, $tag_info['view_mode']);
-    if (count(element_children($element['content'])) > 1) {
-      // Add surrounding divs to group them together.
-      // We dont want divs when there are no additional fields to allow files
-      // to display inline with text, without breaking p tags.
-      $attributes = array(
-        'class' => array(
-          'media',
-          'media-element-container',
-          'media-' . $element['content']['file']['#view_mode'],
-        ),
-      );
-      $element['content']['#prefix'] = '<div ' . drupal_attributes($attributes) . '>';
-      $element['content']['#suffix'] = '</div>';
-    }
+
+    $attributes = array(
+      'class' => array(
+        'media',
+        'media-element-container',
+        'media-' . $element['content']['file']['#view_mode'],
+      ),
+    );
+    $element['content']['#prefix'] = '<div ' . drupal_attributes($attributes) . '>';
+    $element['content']['#suffix'] = '</div>';
   }
   drupal_alter('media_token_to_markup', $element, $tag_info, $settings);
   return drupal_render($element);