diff --git a/templates/content/media.html.twig b/templates/content/media.html.twig
index 4934a7b51e5d77d7dd6639832761f05e7ddaf738..83ee367e7fd24c8d1992d664d13b39e948dddb21 100644
--- a/templates/content/media.html.twig
+++ b/templates/content/media.html.twig
@@ -1,32 +1,40 @@
-{#
-/**
- * @file
- * Theme override to display a media item.
- *
- * Available variables:
- * - name: Name of the media.
- * - content: Media content.
- *
- * @see template_preprocess_media()
- *
- * @ingroup themeable
- */
-#}
-{%
-  set classes = [
-  'media',
-  'media--type-' ~ media.bundle()|clean_class,
-  not media.isPublished() ? 'media--unpublished',
-  view_mode ? 'media--view-mode-' ~ view_mode|clean_class,
-]
-%}
-
-{% embed '@layouts/media/media.twig' with {
-  'classes': classes
-}%}
-
-  {% block content %}
-    {{ content }}
-  {% endblock %}
-
-{% endembed %}
+{#
+/**
+ * @file
+ * Theme override to display a media item.
+ *
+ * Available variables:
+ * - name: Name of the media.
+ * - content: Media content.
+ *
+ * @see template_preprocess_media()
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+  set classes = [
+  'media',
+  'media--type-' ~ media.bundle()|clean_class,
+  not media.isPublished() ? 'media--unpublished',
+  view_mode ? 'media--view-mode-' ~ view_mode|clean_class,
+]
+%}
+
+{% set modifier_classes = '' %}
+
+{% set classes = classes | merge(attributes.class) %}
+
+{% for class in classes %}
+ {% set modifier_classes = modifier_classes ~ ' ' ~ class %}
+{% endfor %}
+
+{% embed '@layouts/media/media.twig' with {
+  'modifier_classes': modifier_classes
+}%}
+
+  {% block content %}
+    {{ content }}
+  {% endblock %}
+
+{% endembed %}