diff --git a/components/accordion_group/accordion_group.twig b/components/accordion_group/accordion_group.twig
index db91b06c09c2b9c616a002c1d90a1734a256ced4..67d52d74f50e446047083da7fcea5d0d1455728b 100644
--- a/components/accordion_group/accordion_group.twig
+++ b/components/accordion_group/accordion_group.twig
@@ -1,5 +1,5 @@
 {% if accordions %}
-  {% if not grouped %}
+  {% if grouped is defined and not grouped %}
     {% set attributes = attributes.setAttribute('data-fr-group', 'false') %}
   {% endif %}
 
diff --git a/components/grid_row/grid_row.twig b/components/grid_row/grid_row.twig
index 8f1677cccbe05cd9257a07bc2830a1da81dd669b..d4f96655c1629876c48c1f74b69a02bd2fa44d16 100644
--- a/components/grid_row/grid_row.twig
+++ b/components/grid_row/grid_row.twig
@@ -1,6 +1,6 @@
 {% set attributes = attributes.addClass([
   'fr-grid-row',
-  with_gutters ? 'fr-grid-row--gutters',
+  with_gutters is not defined or with_gutters ? 'fr-grid-row--gutters',
   horizontal_align ? 'fr-grid-row--' ~ horizontal_align,
   vertical_align ? 'fr-grid-row--' ~ vertical_align,
 ]) %}
diff --git a/components/grid_row_1/grid_row_1.twig b/components/grid_row_1/grid_row_1.twig
index f2c7e5bab514cb7e2b9c00611ea468d392fff416..46aba1ec85dd5a2be8f01ab640301512cc254fb2 100644
--- a/components/grid_row_1/grid_row_1.twig
+++ b/components/grid_row_1/grid_row_1.twig
@@ -1,6 +1,6 @@
 {% set attributes = attributes.addClass([
   'fr-grid-row',
-  with_gutters ? 'fr-grid-row--gutters',
+  with_gutters is not defined or with_gutters ? 'fr-grid-row--gutters',
   horizontal_align ? 'fr-grid-row--' ~ horizontal_align,
   vertical_align ? 'fr-grid-row--' ~ vertical_align,
 ]) %}
diff --git a/components/grid_row_2/grid_row_2.twig b/components/grid_row_2/grid_row_2.twig
index 7096608f31c39e8209ecbc6a039be326df180976..210d23e8c257905348fd92763edaf3510b2af398 100644
--- a/components/grid_row_2/grid_row_2.twig
+++ b/components/grid_row_2/grid_row_2.twig
@@ -1,6 +1,6 @@
 {% set attributes = attributes.addClass([
   'fr-grid-row',
-  with_gutters ? 'fr-grid-row--gutters',
+  with_gutters is not defined or with_gutters ? 'fr-grid-row--gutters',
   horizontal_align ? 'fr-grid-row--' ~ horizontal_align,
   vertical_align ? 'fr-grid-row--' ~ vertical_align,
 ]) %}
diff --git a/components/grid_row_3/grid_row_3.twig b/components/grid_row_3/grid_row_3.twig
index 07ceb1ab75c40e5e8b4f68b8fce225ba9c3548b3..49241f34821d30b836d87cca8eef1d65c13fa9ce 100644
--- a/components/grid_row_3/grid_row_3.twig
+++ b/components/grid_row_3/grid_row_3.twig
@@ -1,6 +1,6 @@
 {% set attributes = attributes.addClass([
   'fr-grid-row',
-  with_gutters ? 'fr-grid-row--gutters',
+  with_gutters is not defined or with_gutters ? 'fr-grid-row--gutters',
   horizontal_align ? 'fr-grid-row--' ~ horizontal_align,
   vertical_align ? 'fr-grid-row--' ~ vertical_align,
 ]) %}
diff --git a/components/grid_row_4/grid_row_4.twig b/components/grid_row_4/grid_row_4.twig
index efdebab2468897f7c04c607c5c44cf543007c58b..38f63fbf0cdc65017ff1573f963ae22b80e50e1c 100644
--- a/components/grid_row_4/grid_row_4.twig
+++ b/components/grid_row_4/grid_row_4.twig
@@ -1,6 +1,6 @@
 {% set attributes = attributes.addClass([
   'fr-grid-row',
-  with_gutters ? 'fr-grid-row--gutters',
+  with_gutters is not defined or with_gutters ? 'fr-grid-row--gutters',
   horizontal_align ? 'fr-grid-row--' ~ horizontal_align,
   vertical_align ? 'fr-grid-row--' ~ vertical_align,
 ]) %}
diff --git a/components/tile/tile.twig b/components/tile/tile.twig
index 24b986eff1cdff4867793496a1d291bf7029ca6a..802274e36170fff668a4d9be0c946669c92d1978 100644
--- a/components/tile/tile.twig
+++ b/components/tile/tile.twig
@@ -19,11 +19,11 @@
   {% set attributes = attributes.addClass('fr-tile--shadow') %}
 {% endif %}
 
-{% if not icon %}
+{% if icon is defined and not icon %}
   {% set attributes = attributes.addClass('fr-tile--no-icon') %}
 {% endif %}
 
-{% if not border %}
+{% if border is defined and not border %}
   {% set attributes = attributes.addClass('fr-tile--no-border') %}
 {% endif %}