diff --git a/src/patterns/04-components/card/card--node/_card--node.twig b/src/patterns/04-components/card/card--node/_card--node.twig
index f22d052f5ff6f3cec5a11a383b1d7f1602dd0864..a2bff65e67653a838e1b75dcbfe508225bef9d6f 100644
--- a/src/patterns/04-components/card/card--node/_card--node.twig
+++ b/src/patterns/04-components/card/card--node/_card--node.twig
@@ -1,7 +1,7 @@
-{% if node.media or node.image %}
-  {% set node_image_class =  'with-image' %}
+{% if media_flags.has_media %}
+  {% set node_image_class =  'with-media' %}
 {% else %}
-  {% set node_image_class =  'without-image' %}
+  {% set node_image_class =  'without-media' %}
 {% endif %}
 
 {% set modifier_classes = 'node--' ~ node.bundle %}
diff --git a/src/patterns/04-components/card/card.twig b/src/patterns/04-components/card/card.twig
index de71a0666a264b2586a3393621e8ed830019f8f4..8d74f01101ffc00437b89e41b8ce65cd2d8522d1 100644
--- a/src/patterns/04-components/card/card.twig
+++ b/src/patterns/04-components/card/card.twig
@@ -1,6 +1,6 @@
 <article class="card{% if type %} card__{{ type }} {% endif %}{% if modifier_classes %} card__{{ modifier_classes }}{% endif %}{% if show_hover %} card--show-hover{% endif %}" {% if type == 'banner' %} id="{{ type }}{{ loop.index }}-{{ banners.uuid }}"{% endif %}>
 
-  {% if media_flags.has_media %}
+  {% if media_flags.has_media and media.media is not empty %}
     {% include '@components/card/card-elements/_media.twig' with {
       'media': media,
       'header': header,
@@ -9,7 +9,8 @@
     } %}
   {% endif %}
 
-  {% if image and bundle != 'uw_ct_profile' %}
+  {% if image is not empty and bundle != 'uw_ct_profile' %}
+    image
     {% include '@components/card/card-elements/_image.twig' with {
       'image': image
     } %}