diff --git a/file_entity.field.inc b/file_entity.field.inc
index 315b9be..889f385 100644
--- a/file_entity.field.inc
+++ b/file_entity.field.inc
@@ -381,8 +381,6 @@ function file_entity_field_formatter_view($entity_type, $entity, $field, $instan
 
     // Render each source list as an <video> element.
     foreach ($source_lists as $delta => $sources) {
-      $width = $settings['width'];
-      $height = $settings['height'];
       $element[$delta] = array(
         '#theme' => 'file_entity_file_video',
         '#files' => $sources,
@@ -390,8 +388,8 @@ function file_entity_field_formatter_view($entity_type, $entity, $field, $instan
         '#autoplay' => $settings['autoplay'],
         '#loop' => $settings['loop'],
         '#muted' => $settings['muted'],
-        '#width' => ($width && $height) ? $width : NULL,
-        '#height' => ($width && $height) ? $height : NULL,
+        '#width' => $settings['width'],
+        '#height' => $settings['height'],
       );
     }
   }
diff --git a/file_entity.theme.inc b/file_entity.theme.inc
index 123b83e..417aeae 100644
--- a/file_entity.theme.inc
+++ b/file_entity.theme.inc
@@ -142,8 +142,10 @@ function theme_file_entity_file_video($variables) {
   if ($variables['muted']) {
     $video_attributes['muted'] = 'muted';
   }
-  if ($variables['width'] && $variables['height']) {
+  if ($variables['width']) {
     $video_attributes['width'] = $variables['width'];
+  }
+  if ($variables['height']) {
     $video_attributes['height'] = $variables['height'];
   }