diff --git a/fallback_media.info.yml b/fallback_media.info.yml
index e5f51e1..e2c2660 100644
--- a/fallback_media.info.yml
+++ b/fallback_media.info.yml
@@ -2,6 +2,7 @@ name: Media Fallback
 type: module
 description: Fallback to another entity if the field is empty
 core: 8.x
+core_version_requirement: ^8 || ^9
 package: Media
 dependencies:
   - drupal:media
diff --git a/src/Form/FallbackEntityDeleteForm.php b/src/Form/FallbackEntityDeleteForm.php
index d8b7a48..33e390e 100644
--- a/src/Form/FallbackEntityDeleteForm.php
+++ b/src/Form/FallbackEntityDeleteForm.php
@@ -38,14 +38,12 @@ class FallbackEntityDeleteForm extends EntityConfirmFormBase {
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $this->entity->delete();
 
-    drupal_set_message(
-      $this->t('content @type: deleted @label.',
-        [
-          '@type' => $this->entity->bundle(),
-          '@label' => $this->entity->label(),
-        ]
-        )
-    );
+    $this->messenger()->addStatus($this->t('content @type: deleted @label.',
+      [
+        '@type' => $this->entity->bundle(),
+        '@label' => $this->entity->label(),
+      ]
+      ));
 
     $form_state->setRedirectUrl($this->getCancelUrl());
   }
diff --git a/src/Form/FallbackEntityForm.php b/src/Form/FallbackEntityForm.php
index 721586e..fe7d7ed 100644
--- a/src/Form/FallbackEntityForm.php
+++ b/src/Form/FallbackEntityForm.php
@@ -56,13 +56,13 @@ class FallbackEntityForm extends EntityForm {
 
     switch ($status) {
       case SAVED_NEW:
-        drupal_set_message($this->t('Created the %label Fallback entity.', [
+        $this->messenger()->addStatus($this->t('Created the %label Fallback entity.', [
           '%label' => $fallback_entity->label(),
         ]));
         break;
 
       default:
-        drupal_set_message($this->t('Saved the %label Fallback entity.', [
+        $this->messenger()->addStatus($this->t('Saved the %label Fallback entity.', [
           '%label' => $fallback_entity->label(),
         ]));
     }