diff --git a/src/MarketplaceStorage.php b/src/MarketplaceStorage.php
index c15a7e1..0e5b7bb 100644
--- a/src/MarketplaceStorage.php
+++ b/src/MarketplaceStorage.php
@@ -16,12 +16,15 @@ use Drupal\Core\Session\AccountInterface;
 use Drupal\commerce_store\Entity\StoreInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Drupal\Core\Messenger\MessengerTrait;
 
 /**
  * Overrides the store storage class.
  */
 class MarketplaceStorage extends StoreStorage {
 
+  use MessengerTrait;
+
   /**
    * The config factory.
    *
@@ -116,7 +119,7 @@ class MarketplaceStorage extends StoreStorage {
       $default = $store;
       $default->enforceIsNew();
       if (count($stores) > 1) {
-        drupal_set_message(t('No one default store is assigned yet. Note that it is recommended to have one explicitly assigned otherwise the last found store will be dimmed as the default. This may lead to unexpected behaviour.'), 'warning', FALSE);
+        $this->messenger()->addWarning(t('No one default store is assigned yet. Note that it is recommended to have one explicitly assigned otherwise the last found store will be dimmed as the default. This may lead to unexpected behaviour.'), FALSE);
       }
     }
     elseif (!$default && $stores) {
diff --git a/src/Plugin/Action/MarketplaceClearOwnerLimit.php b/src/Plugin/Action/MarketplaceClearOwnerLimit.php
index 887e515..cdab690 100644
--- a/src/Plugin/Action/MarketplaceClearOwnerLimit.php
+++ b/src/Plugin/Action/MarketplaceClearOwnerLimit.php
@@ -4,6 +4,7 @@ namespace Drupal\commerce_marketplace\Plugin\Action;
 
 use Drupal\Core\Action\ActionBase;
 use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Messenger\MessengerTrait;
 
 /**
  * Clears store type limit for an owner.
@@ -16,6 +17,8 @@ use Drupal\Core\Session\AccountInterface;
  */
 class MarketplaceClearOwnerLimit extends ActionBase {
 
+  use MessengerTrait;
+
   /**
    * {@inheritdoc}
    */
@@ -37,7 +40,7 @@ class MarketplaceClearOwnerLimit extends ActionBase {
       if ($owner_is_admin) {
         $name = $owner->getUsername();
         $msg = $this->t("The owner limit cannot be cleared for the %name because they have admin permission and don't have any limits.", ['%name' => $name]);
-        drupal_set_message($msg, 'warning', FALSE);
+        $this->messenger()->addWarning($msg, FALSE);
       }
       elseif (!isset($limits[$uid][$store_type])) {
         $limits[$uid][$store_type] = [
diff --git a/src/Plugin/Action/MarketplaceIncreaseOwnerLimitByOne.php b/src/Plugin/Action/MarketplaceIncreaseOwnerLimitByOne.php
index c04bc59..93ee034 100644
--- a/src/Plugin/Action/MarketplaceIncreaseOwnerLimitByOne.php
+++ b/src/Plugin/Action/MarketplaceIncreaseOwnerLimitByOne.php
@@ -4,6 +4,7 @@ namespace Drupal\commerce_marketplace\Plugin\Action;
 
 use Drupal\Core\Action\ActionBase;
 use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Messenger\MessengerTrait;
 
 /**
  * Increases store type limit by one for an owner.
@@ -16,6 +17,8 @@ use Drupal\Core\Session\AccountInterface;
  */
 class MarketplaceIncreaseOwnerLimitByOne extends ActionBase {
 
+  use MessengerTrait;
+
   /**
    * {@inheritdoc}
    */
@@ -37,7 +40,7 @@ class MarketplaceIncreaseOwnerLimitByOne extends ActionBase {
       if ($owner_is_admin) {
         $name = $owner->getUsername();
         $msg = $this->t('The store type limit cannot be set for the %name because they have admin permission and should not have any limits.', ['%name' => $name]);
-        drupal_set_message($msg, 'warning', FALSE);
+        $this->messenger()->addWarning($msg, FALSE);
       }
       elseif (!isset($limits[$uid][$store_type])) {
         $limit = $storage->getStoreLimit($store_type, $uid);
diff --git a/src/Plugin/Action/MarketplaceMarkAsOwnerDefault.php b/src/Plugin/Action/MarketplaceMarkAsOwnerDefault.php
index 86d94ed..fadb05c 100644
--- a/src/Plugin/Action/MarketplaceMarkAsOwnerDefault.php
+++ b/src/Plugin/Action/MarketplaceMarkAsOwnerDefault.php
@@ -4,6 +4,7 @@ namespace Drupal\commerce_marketplace\Plugin\Action;
 
 use Drupal\Core\Action\ActionBase;
 use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Messenger\MessengerTrait;
 
 /**
  * Marks store as owner default.
@@ -16,6 +17,8 @@ use Drupal\Core\Session\AccountInterface;
  */
 class MarketplaceMarkAsOwnerDefault extends ActionBase {
 
+  use MessengerTrait;
+
   /**
    * {@inheritdoc}
    */
@@ -36,7 +39,7 @@ class MarketplaceMarkAsOwnerDefault extends ActionBase {
       if ($owner_is_admin) {
         $name = $owner->getUsername();
         $msg = $this->t('The %name store cannot be set as owner default because they have admin permission and should use a global default store.', ['%name' => $name]);
-        drupal_set_message($msg, 'warning', FALSE);
+        $this->messenger()->addWarning($msg, FALSE);
       }
       elseif (!isset($owners[$uid])) {
         if ($config->get("owners.{$uid}.default_store") != $uuid) {
diff --git a/src/Plugin/Action/MarketplaceSetOwnerLimitToOne.php b/src/Plugin/Action/MarketplaceSetOwnerLimitToOne.php
index a9c88e4..fe98842 100644
--- a/src/Plugin/Action/MarketplaceSetOwnerLimitToOne.php
+++ b/src/Plugin/Action/MarketplaceSetOwnerLimitToOne.php
@@ -4,6 +4,7 @@ namespace Drupal\commerce_marketplace\Plugin\Action;
 
 use Drupal\Core\Action\ActionBase;
 use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Messenger\MessengerTrait;
 
 /**
  * Sets store type limit to one for an owner.
@@ -16,6 +17,8 @@ use Drupal\Core\Session\AccountInterface;
  */
 class MarketplaceSetOwnerLimitToOne extends ActionBase {
 
+  use MessengerTrait;
+
   /**
    * {@inheritdoc}
    */
@@ -37,7 +40,7 @@ class MarketplaceSetOwnerLimitToOne extends ActionBase {
       if ($owner_is_admin) {
         $name = $owner->getUsername();
         $msg = $this->t('The owner limit on a store type cannot be set for the %name because they have admin permission and should not have any limits.', ['%name' => $name]);
-        drupal_set_message($msg, 'warning', FALSE);
+        $this->messenger()->addWarning($msg, FALSE);
       }
       if (!isset($limits[$uid][$store_type])) {
         $limits[$uid][$store_type] = 1;