diff --git a/lib/Entities/NewsletterTemplateEntity.php b/lib/Entities/NewsletterTemplateEntity.php
index 296484b0c7..b7b8d5ba59 100644
--- a/lib/Entities/NewsletterTemplateEntity.php
+++ b/lib/Entities/NewsletterTemplateEntity.php
@@ -57,6 +57,10 @@ class NewsletterTemplateEntity {
    */
   private $readonly = false;
 
+  public function __construct(string $name) {
+    $this->name = $name;
+  }
+
   /**
    * @return NewsletterEntity|null
    */
diff --git a/lib/NewsletterTemplates/NewsletterTemplatesRepository.php b/lib/NewsletterTemplates/NewsletterTemplatesRepository.php
index d18e75eb05..6157b457bc 100644
--- a/lib/NewsletterTemplates/NewsletterTemplatesRepository.php
+++ b/lib/NewsletterTemplates/NewsletterTemplatesRepository.php
@@ -42,7 +42,7 @@ class NewsletterTemplatesRepository extends Repository {
       : null;
 
     if (!$template) {
-      $template = new NewsletterTemplateEntity();
+      $template = new NewsletterTemplateEntity($data['name'] ?? '');
       $this->entityManager->persist($template);
     }
 
diff --git a/tests/integration/API/JSON/v1/NewsletterTemplatesTest.php b/tests/integration/API/JSON/v1/NewsletterTemplatesTest.php
index 9bef34b9b4..f3c44d2d46 100644
--- a/tests/integration/API/JSON/v1/NewsletterTemplatesTest.php
+++ b/tests/integration/API/JSON/v1/NewsletterTemplatesTest.php
@@ -18,13 +18,11 @@ class NewsletterTemplatesTest extends \MailPoetTest {
     $this->truncateEntity(NewsletterTemplateEntity::class);
     $this->newsletterTemplatesRepository = $this->diContainer->get(NewsletterTemplatesRepository::class);
 
-    $template1 = new NewsletterTemplateEntity();
-    $template1->setName('Template #1');
+    $template1 = new NewsletterTemplateEntity('Template #1');
     $template1->setBody(['key1' => 'value1']);
     $this->entityManager->persist($template1);
 
-    $template2 = new NewsletterTemplateEntity();
-    $template2->setName('Template #2');
+    $template2 = new NewsletterTemplateEntity('Template #2');
     $template2->setBody(['key2' => 'value2']);
     $template2->setNewsletter($this->entityManager->getReference(NewsletterEntity::class, 1));
     $this->entityManager->persist($template2);
diff --git a/tests/integration/NewsletterTemplates/NewsletterTemplatesRepositoryTest.php b/tests/integration/NewsletterTemplates/NewsletterTemplatesRepositoryTest.php
index e2ae09a9f1..6fc2cf8a4e 100644
--- a/tests/integration/NewsletterTemplates/NewsletterTemplatesRepositoryTest.php
+++ b/tests/integration/NewsletterTemplates/NewsletterTemplatesRepositoryTest.php
@@ -34,8 +34,7 @@ class NewsletterTemplatesRepositoryTest extends \MailPoetTest {
   public function testItCleansRecentlySent() {
     $total = NewsletterTemplatesRepository::RECENTLY_SENT_COUNT + 5;
     for ($i = 0; $i < $total; $i++) {
-      $template = new NewsletterTemplateEntity();
-      $template->setName('Testing template ' . $i);
+      $template = new NewsletterTemplateEntity('Testing template ' . $i);
       $template->setBody(['key' => 'value']);
       $template->setCategories(NewsletterTemplatesRepository::RECENTLY_SENT_CATEGORIES);
       $this->entityManager->persist($template);