diff --git a/src/Form/AddressFormatterDeleteForm.php b/src/Form/AddressFormatterDeleteForm.php
index daa7b9f..0e060b0 100644
--- a/src/Form/AddressFormatterDeleteForm.php
+++ b/src/Form/AddressFormatterDeleteForm.php
@@ -38,7 +38,7 @@ class AddressFormatterDeleteForm extends EntityConfirmFormBase {
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $this->entity->delete();
 
-    drupal_set_message(
+    \Drupal::messenger()->addMessage(
       $this->t('Deleted the %label AddressFormatter options.',
         [
           '%label' => $this->entity->label(),
diff --git a/src/Form/AddressFormatterForm.php b/src/Form/AddressFormatterForm.php
index d2afb40..16a2942 100644
--- a/src/Form/AddressFormatterForm.php
+++ b/src/Form/AddressFormatterForm.php
@@ -190,13 +190,13 @@ class AddressFormatterForm extends EntityForm {
 
     switch ($status) {
       case SAVED_NEW:
-        drupal_set_message($this->t('Created the %label AddressFormatter options.', [
+        \Drupal::messenger()->addMessage($this->t('Created the %label AddressFormatter options.', [
           '%label' => $entity->label(),
         ]));
         break;
 
       default:
-        drupal_set_message($this->t('Saved the %label AddressFormatter options.', [
+        \Drupal::messenger()->addMessage($this->t('Saved the %label AddressFormatter options.', [
           '%label' => $entity->label(),
         ]));
     }