diff --git a/src/formio/templates/editGrid.ejs b/src/formio/templates/editGrid.ejs
index ac65fb0fd..040e04309 100644
--- a/src/formio/templates/editGrid.ejs
+++ b/src/formio/templates/editGrid.ejs
@@ -1,4 +1,5 @@
 <div class="openforms-editgrid">
+  {% if(ctx.rows.length) { %}
   <div>
     {% ctx.rows.forEach(function(row, rowIndex) { %}
       <div class="utrecht-form-fieldset openforms-editgrid__item">
@@ -39,6 +40,7 @@
 
     {% }) %}
   </div>
+  {% } %}
 
   {% if (!ctx.readOnly && ctx.hasAddButton) { %}
     <p class="utrecht-button-group">