diff --git a/include/upgrader/streams/core/d51f303a-dad45ca2.task.php b/include/upgrader/streams/core/d51f303a-dad45ca2.task.php
index b6ce55914aba2f7d5a933ebb057f6651248fa4f3..309f68e836e9f808a47fd3e69f6f143642226597 100644
--- a/include/upgrader/streams/core/d51f303a-dad45ca2.task.php
+++ b/include/upgrader/streams/core/d51f303a-dad45ca2.task.php
@@ -8,8 +8,13 @@ class NewHtmlTemplate extends MigrationTask {
 
         $i18n = new Internationalization('en_US');
         $tpls = $i18n->getTemplate('email_template_group.yaml')->getData();
-        foreach ($tpls as $t)
+        foreach ($tpls as $t) {
+            // If the email template group specifies an id attribute, remove
+            // it for upgrade because we cannot assume that the id slot is
+            // available
+            unset($t['id']);
             EmailTemplateGroup::create($t, $errors);
+        }
 
         $files = $i18n->getTemplate('file.yaml')->getData();
         foreach ($files as $f) {