diff --git a/templates/MetaTemplates/get_meta_fields_to_update.php b/templates/MetaTemplates/get_meta_fields_to_update.php
index 46d9dfa..51091f5 100644
--- a/templates/MetaTemplates/get_meta_fields_to_update.php
+++ b/templates/MetaTemplates/get_meta_fields_to_update.php
@@ -29,7 +29,7 @@ foreach ($entities as $entity) {
     );
 }
 if ($amountOfEntitiesToUpdate > 10) {
-    $bodyHtml .= sprintf('<li class="list-inline-item fw-light fs-7">%s</li>', __('{0} more entities', h(10 - $amountOfEntitiesToUpdate)));
+    $bodyHtml .= sprintf('<li class="list-inline-item fw-light fs-7">%s</li>', __('{0} more entities', $amountOfEntitiesToUpdate - 10));
 }
 $bodyHtml .= '</ul>';
 
diff --git a/templates/MetaTemplates/migrate_metafields_to_newest_template.php b/templates/MetaTemplates/migrate_metafields_to_newest_template.php
index 09a7c3b..bf25363 100644
--- a/templates/MetaTemplates/migrate_metafields_to_newest_template.php
+++ b/templates/MetaTemplates/migrate_metafields_to_newest_template.php
@@ -33,7 +33,7 @@ if (empty($conflictingEntities)) {
         'dismissible' => false,
     ]);
     $bodyHtml .= '<ul>';
-    foreach ($conflictingEntities as $entity) {
+    foreach ($conflictingEntities as $i => $entity) {
         $url = Router::url([
             'controller' => 'metaTemplates',
             'action' => 'migrateOldMetaTemplateToNewestVersionForEntity',
@@ -46,9 +46,10 @@ if (empty($conflictingEntities)) {
             __('{0}::{1}', h(Inflector::humanize($oldMetaTemplate->scope)), $entity->id),
             __('has {0} meta-fields to update', count($entity->meta_fields))
         );
-    }
-    if (count($conflictingEntities) > 10) {
-        $bodyHtml .= sprintf('<li class="list-inline-item fw-light fs-7">%s</li>', __('{0} more entities', h(10 - count($conflictingEntities))));
+        if ($i >= 9) {
+            $bodyHtml .= sprintf('<li class="list-inline-item fw-light fs-7">%s</li>', __('{0} more entities', count($conflictingEntities) - 10));
+            break;
+        }
     }
     $bodyHtml .= '</ul>';
 }