diff --git a/src/Controller/RestUIController.php b/src/Controller/RestUIController.php
index c85d5a3..313e30d 100644
--- a/src/Controller/RestUIController.php
+++ b/src/Controller/RestUIController.php
@@ -10,6 +10,7 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Drupal\rest\Plugin\Type\ResourcePluginManager;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Url;
+use Drupal\Core\Messenger\MessengerInterface;
 
 /**
  * Controller routines for REST resources.
@@ -39,6 +40,13 @@ class RestUIController implements ContainerInjectionInterface {
    */
   protected $resourceConfigStorage;
 
+  /**
+   * The Messenger service.
+   *
+   * @var \Drupal\Core\Messenger\MessengerInterface
+   */
+  protected $messenger;
+
   /**
    * Injects RestUIManager Service.
    */
@@ -46,7 +54,8 @@ class RestUIController implements ContainerInjectionInterface {
     return new static(
       $container->get('plugin.manager.rest'),
       $container->get('url_generator'),
-      $container->get('entity_type.manager')->getStorage('rest_resource_config')
+      $container->get('entity_type.manager')->getStorage('rest_resource_config'),
+      $container->get('messenger')
     );
   }
 
@@ -59,11 +68,14 @@ class RestUIController implements ContainerInjectionInterface {
    *   The URL generator.
    * @param \Drupal\Core\Entity\EntityStorageInterface $resource_config_storage
    *   The REST resource config storage.
+   * @param \Drupal\Core\Messenger\MessengerInterface $messenger
+   *   The REST resource config storage.
    */
-  public function __construct(ResourcePluginManager $resourcePluginManager, UrlGeneratorInterface $url_generator, EntityStorageInterface $resource_config_storage) {
+  public function __construct(ResourcePluginManager $resourcePluginManager, UrlGeneratorInterface $url_generator, EntityStorageInterface $resource_config_storage, MessengerInterface $messenger) {
     $this->resourcePluginManager = $resourcePluginManager;
     $this->urlGenerator = $url_generator;
     $this->resourceConfigStorage = $resource_config_storage;
+    $this->messenger = $messenger;
   }
 
   /**
@@ -277,7 +289,7 @@ class RestUIController implements ContainerInjectionInterface {
 
     if ($resources[$this->getResourceKey($resource_id)]) {
       $resources[$this->getResourceKey($resource_id)]->disable()->save();
-      drupal_set_message(t('The resource was disabled successfully.'));
+      $this->messenger->addStatus($this->t('The resource was disabled successfully.'));
     }
 
     // Redirect back to the page.
diff --git a/src/Form/RestUIForm.php b/src/Form/RestUIForm.php
index 82f0b84..cc86eca 100644
--- a/src/Form/RestUIForm.php
+++ b/src/Form/RestUIForm.php
@@ -13,6 +13,7 @@ use Drupal\rest\RestResourceConfigInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Drupal\rest\Plugin\Type\ResourcePluginManager;
+use Drupal\Core\Messenger\MessengerInterface;
 
 /**
  * Provides a REST resource configuration form.
@@ -54,6 +55,13 @@ class RestUIForm extends ConfigFormBase {
    */
   protected $resourceConfigStorage;
 
+  /**
+   * The Messenger service.
+   *
+   * @var \Drupal\Core\Messenger\MessengerInterface
+   */
+  protected $messenger;
+
   /**
    * Constructs a \Drupal\user\RestForm object.
    *
@@ -70,13 +78,14 @@ class RestUIForm extends ConfigFormBase {
    * @param \Drupal\Core\Entity\EntityStorageInterface $resource_config_storage
    *   The REST resource config storage.
    */
-  public function __construct(ConfigFactoryInterface $config_factory, ModuleHandler $module_handler, AuthenticationCollectorInterface $authentication_collector, array $formats, ResourcePluginManager $resourcePluginManager, EntityStorageInterface $resource_config_storage) {
+  public function __construct(ConfigFactoryInterface $config_factory, ModuleHandler $module_handler, AuthenticationCollectorInterface $authentication_collector, array $formats, ResourcePluginManager $resourcePluginManager, EntityStorageInterface $resource_config_storage, MessengerInterface $messenger) {
     parent::__construct($config_factory);
     $this->moduleHandler = $module_handler;
     $this->authenticationCollector = $authentication_collector;
     $this->formats = $formats;
     $this->resourcePluginManager = $resourcePluginManager;
     $this->resourceConfigStorage = $resource_config_storage;
+    $this->messenger = $messenger;
   }
 
   /**
@@ -89,7 +98,8 @@ class RestUIForm extends ConfigFormBase {
       $container->get('authentication_collector'),
       $container->getParameter('serializer.formats'),
       $container->get('plugin.manager.rest'),
-      $container->get('entity_type.manager')->getStorage('rest_resource_config')
+      $container->get('entity_type.manager')->getStorage('rest_resource_config'),
+      $container->get('messenger')
     );
   }
 
@@ -422,6 +432,7 @@ class RestUIForm extends ConfigFormBase {
     $config->save();
 
     drupal_set_message($this->t('The resource has been updated.'));
+    $this->messenger->addStatus($this->t('The resource has been updated.'));
     // Redirect back to the listing.
     $form_state->setRedirect('restui.list');
   }