diff --git a/templates/module/src/Entity/Form/entity-content.php.twig b/templates/module/src/Entity/Form/entity-content.php.twig
index 2ca2db526..6be6dd2e6 100644
--- a/templates/module/src/Entity/Form/entity-content.php.twig
+++ b/templates/module/src/Entity/Form/entity-content.php.twig
@@ -66,18 +66,11 @@ class {{ entity_class }}Form extends ContentEntityForm {% endblock %}
 
     $status = parent::save($form, $form_state);
 
-    switch ($status) {
-      case SAVED_NEW:
-        \Drupal::messenger()->addMessage($this->t('Created the %label {{ label }}.', [
-          '%label' => $entity->label(),
-        ]));
-        break;
+    $this->messenger()->addMessage($this->t('%action the %label {{ label }}.', [
+      '%action' => $status == SAVED_NEW ? 'Created' : 'Saved',
+      '%label' => $entity->label(),
+    ]));
 
-      default:
-        \Drupal::messenger()->addMessage($this->t('Saved the %label {{ label }}.', [
-          '%label' => $entity->label(),
-        ]));
-    }
     $form_state->setRedirect('entity.{{ entity_name }}.canonical', ['{{ entity_name }}' => $entity->id()]);
   }
 {% endblock %}