diff --git a/mask_user_data.module b/mask_user_data.module
index 6eff669..493a6e1 100644
--- a/mask_user_data.module
+++ b/mask_user_data.module
@@ -123,6 +123,6 @@ function mask_user_data_finished_method($success, $results, $operations) {
     drush_log(dt('Update completed, all data has been masked.'), 'success');
   }
   else {
-    drupal_set_message(t('Update completed, all data has been masked.'));
+    \Drupal::messenger()->addStatus(t('Update completed, all data has been masked.'));
   }
 }
diff --git a/src/Form/Mask.php b/src/Form/Mask.php
index b6cc718..39dde86 100644
--- a/src/Form/Mask.php
+++ b/src/Form/Mask.php
@@ -162,10 +162,10 @@ class Mask extends ConfigFormBase {
       if ($this->user->load($uid)) {
         $map_array = $config->get('map_array') ?: NULL;
         $this->maskUserService->mask($uid, $map_array);
-        drupal_set_message($this->t('User ID %uid was masked.', ['%uid' => $uid]));
+        $this->messenger()->addStatus($this->t('User ID %uid was masked.', ['%uid' => $uid]));
       }
       else {
-        drupal_set_message($this->t('User ID %uid does not exists.', ['%uid' => $uid]), 'error');
+        $this->messenger()->addError($this->t('User ID %uid does not exists.', ['%uid' => $uid]));
       }
     }
     else {