diff --git a/devel.services.yml b/devel.services.yml
index 2e74e1a..82fe6aa 100644
--- a/devel.services.yml
+++ b/devel.services.yml
@@ -7,7 +7,7 @@ services:
 
   devel.theme_rebuild_subscriber:
     class: Drupal\devel\EventSubscriber\ThemeInfoRebuildSubscriber
-    arguments: ['@config.factory', '@current_user', '@theme_handler']
+    arguments: ['@config.factory', '@current_user', '@theme_handler', '@messenger']
     tags:
       - { name: event_subscriber }
 
@@ -23,7 +23,7 @@ services:
 
   devel.dumper:
     class: Drupal\devel\DevelDumperManager
-    arguments: ['@config.factory', '@current_user', '@plugin.manager.devel_dumper']
+    arguments: ['@config.factory', '@current_user', '@plugin.manager.devel_dumper', '@messenger']
 
   devel.twig.debug_extension:
     class: Drupal\devel\Twig\Extension\Debug
diff --git a/devel_generate/src/Form/DevelGenerateForm.php b/devel_generate/src/Form/DevelGenerateForm.php
index 63c708b..9509a0a 100644
--- a/devel_generate/src/Form/DevelGenerateForm.php
+++ b/devel_generate/src/Form/DevelGenerateForm.php
@@ -5,6 +5,7 @@ namespace Drupal\devel_generate\Form;
 use Drupal\Component\Plugin\PluginManagerInterface;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\devel_generate\DevelGenerateException;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -13,6 +14,13 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  */
 class DevelGenerateForm extends FormBase {
 
+  /**
+   * The messenger service.
+   *
+   * @var Drupal\Core\Messenger\MessengerInterface
+   */
+  protected $messenger;
+
   /**
    * The manager to be used for instantiating plugins.
    *
@@ -25,9 +33,12 @@ class DevelGenerateForm extends FormBase {
    *
    * @param \Drupal\Component\Plugin\PluginManagerInterface $devel_generate_manager
    *   The manager to be used for instantiating plugins.
+   * @param Drupal\Core\Messenger\MessengerInterface $messenger
+   *   The messenger service.
    */
-  public function __construct(PluginManagerInterface $devel_generate_manager) {
+  public function __construct(PluginManagerInterface $devel_generate_manager, MessengerInterface $messenger) {
     $this->develGenerateManager = $devel_generate_manager;
+    $this->messenger = $messenger;
   }
 
   /**
@@ -35,7 +46,8 @@ class DevelGenerateForm extends FormBase {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('plugin.manager.develgenerate')
+      $container->get('plugin.manager.develgenerate'),
+      $container->get('messenger')
     );
   }
 
@@ -107,7 +119,7 @@ class DevelGenerateForm extends FormBase {
     }
     catch (DevelGenerateException $e) {
       $this->logger('DevelGenerate', $this->t('Failed to generate elements due to "%error".', array('%error' => $e->getMessage())));
-      drupal_set_message($this->t('Failed to generate elements due to "%error".', array('%error' => $e->getMessage())));
+      $this->messenger->addMessage($this->t('Failed to generate elements due to "%error".', array('%error' => $e->getMessage())));
     }
   }
 
diff --git a/src/Controller/DevelController.php b/src/Controller/DevelController.php
index 2c3a7b4..6c3a1d8 100644
--- a/src/Controller/DevelController.php
+++ b/src/Controller/DevelController.php
@@ -3,6 +3,7 @@
 namespace Drupal\devel\Controller;
 
 use Drupal\Core\Controller\ControllerBase;
+use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\Core\Url;
 use Drupal\devel\DevelDumperManagerInterface;
 use Drupal\field\Entity\FieldConfig;
@@ -21,21 +22,34 @@ class DevelController extends ControllerBase {
    */
   protected $dumper;
 
+  /**
+   * The messenger service.
+   *
+   * @var Drupal\Core\Messenger\MessengerInterface
+   */
+  protected $messenger;
+
   /**
    * EntityDebugController constructor.
    *
    * @param \Drupal\devel\DevelDumperManagerInterface $dumper
    *   The dumper service.
+   * @param Drupal\Core\Messenger\MessengerInterface $messenger
+   *   The messenger service.
    */
-  public function __construct(DevelDumperManagerInterface $dumper) {
+  public function __construct(DevelDumperManagerInterface $dumper, MessengerInterface $messenger) {
     $this->dumper = $dumper;
+    $this->messenger = $messenger;
   }
 
   /**
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
-    return new static($container->get('devel.dumper'));
+    return new static(
+      $container->get('devel.dumper'),
+      $container->get('messenger')
+      );
   }
 
   /**
@@ -43,7 +57,7 @@ class DevelController extends ControllerBase {
    */
   public function cacheClear() {
     drupal_flush_all_caches();
-    drupal_set_message('Cache cleared.');
+    $this->messenger->addMessage('Cache cleared.');
     return $this->redirect('<front>');
   }
 
diff --git a/src/Controller/RouteInfoController.php b/src/Controller/RouteInfoController.php
index 45c9f6d..b984631 100644
--- a/src/Controller/RouteInfoController.php
+++ b/src/Controller/RouteInfoController.php
@@ -3,6 +3,7 @@
 namespace Drupal\devel\Controller;
 
 use Drupal\Core\Controller\ControllerBase;
+use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Routing\RouteProviderInterface;
 use Drupal\Core\Url;
@@ -37,6 +38,13 @@ class RouteInfoController extends ControllerBase {
    */
   protected $dumper;
 
+  /**
+   * The messenger service.
+   *
+   * @var Drupal\Core\Messenger\MessengerInterface
+   */
+  protected $messenger;
+
   /**
    * RouterInfoController constructor.
    *
@@ -46,11 +54,14 @@ class RouteInfoController extends ControllerBase {
    *   The router service.
    * @param \Drupal\devel\DevelDumperManagerInterface $dumper
    *   The dumper service.
+   * @param Drupal\Core\Messenger\MessengerInterface $messenger
+   *   The messenger service.
    */
-  public function __construct(RouteProviderInterface $provider, RouterInterface $router, DevelDumperManagerInterface $dumper) {
+  public function __construct(RouteProviderInterface $provider, RouterInterface $router, DevelDumperManagerInterface $dumper, MessengerInterface $messenger) {
     $this->routeProvider = $provider;
     $this->router = $router;
     $this->dumper = $dumper;
+    $this->messenger = $messenger;
   }
 
   /**
@@ -60,7 +71,8 @@ class RouteInfoController extends ControllerBase {
     return new static(
       $container->get('router.route_provider'),
       $container->get('router.no_access_checks'),
-      $container->get('devel.dumper')
+      $container->get('devel.dumper'),
+      $container->get('messenger')
     );
   }
 
@@ -177,7 +189,7 @@ class RouteInfoController extends ControllerBase {
         $route = $this->router->match($path);
       }
       catch (\Exception $e) {
-        drupal_set_message($this->t("Unable to load route for url '%url'", ['%url' => $path]), 'warning');
+        $this->messenger->addMessage($this->t("Unable to load route for url '%url'", ['%url' => $path]), 'warning');
       }
     }
 
@@ -188,7 +200,7 @@ class RouteInfoController extends ControllerBase {
         $route = $this->routeProvider->getRouteByName($route_name);
       }
       catch (\Exception $e) {
-        drupal_set_message($this->t("Unable to load route '%name'", ['%name' => $route_name]), 'warning');
+        $this->messenger->addMessage($this->t("Unable to load route '%name'", ['%name' => $route_name]), 'warning');
       }
     }
 
diff --git a/src/DevelDumperManager.php b/src/DevelDumperManager.php
index b88957e..2aec5ac 100644
--- a/src/DevelDumperManager.php
+++ b/src/DevelDumperManager.php
@@ -3,6 +3,7 @@
 namespace Drupal\devel;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\Core\Session\AccountProxyInterface;
 
 /**
@@ -31,6 +32,13 @@ class DevelDumperManager implements DevelDumperManagerInterface {
    */
   protected $dumperManager;
 
+  /**
+   * The messenger service.
+   *
+   * @var Drupal\Core\Messenger\MessengerInterface
+   */
+  protected $messenger;
+
   /**
    * Constructs a DevelDumperPluginManager object.
    *
@@ -40,11 +48,14 @@ class DevelDumperManager implements DevelDumperManagerInterface {
    *   The current account.
    * @param \Drupal\devel\DevelDumperPluginManagerInterface $dumper_manager
    *   The devel dumper plugin manager.
+   * @param Drupal\Core\Messenger\MessengerInterface $messenger
+   *   The messenger service.
    */
-  public function __construct(ConfigFactoryInterface $config_factory, AccountProxyInterface $account, DevelDumperPluginManagerInterface $dumper_manager) {
+  public function __construct(ConfigFactoryInterface $config_factory, AccountProxyInterface $account, DevelDumperPluginManagerInterface $dumper_manager, MessengerInterface $messenger) {
     $this->config = $config_factory->get('devel.settings');
     $this->account = $account;
     $this->dumperManager = $dumper_manager;
+    $this->messenger = $messenger;
   }
 
   /**
@@ -88,7 +99,7 @@ class DevelDumperManager implements DevelDumperManagerInterface {
   public function message($input, $name = NULL, $type = 'status', $plugin_id = NULL) {
     if ($this->hasAccessToDevelInformation()) {
       $output = $this->export($input, $name, $plugin_id);
-      drupal_set_message($output, $type, TRUE);
+      $this->messenger->addMessage($output, $type, TRUE);
     }
   }
 
@@ -100,7 +111,7 @@ class DevelDumperManager implements DevelDumperManagerInterface {
     // The temp directory does vary across multiple simpletest instances.
     $file = file_directory_temp() . '/drupal_debug.txt';
     if (file_put_contents($file, $output, FILE_APPEND) === FALSE && $this->hasAccessToDevelInformation()) {
-      drupal_set_message(t('Devel was unable to write to %file.', ['%file' => $file]), 'error');
+      $this->messenger->addMessage(t('Devel was unable to write to %file.', ['%file' => $file]), 'error');
       return FALSE;
     }
   }
diff --git a/src/EventSubscriber/ThemeInfoRebuildSubscriber.php b/src/EventSubscriber/ThemeInfoRebuildSubscriber.php
index 596e709..5fffe6a 100644
--- a/src/EventSubscriber/ThemeInfoRebuildSubscriber.php
+++ b/src/EventSubscriber/ThemeInfoRebuildSubscriber.php
@@ -4,6 +4,7 @@ namespace Drupal\devel\EventSubscriber;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Extension\ThemeHandlerInterface;
+use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\Core\Session\AccountProxyInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\Url;
@@ -47,6 +48,13 @@ class ThemeInfoRebuildSubscriber implements EventSubscriberInterface {
    */
   protected $themeHandler;
 
+  /**
+   * The messenger service.
+   *
+   * @var Drupal\Core\Messenger\MessengerInterface
+   */
+  protected $messenger;
+
   /**
    * Constructs a ThemeInfoRebuildSubscriber object.
    *
@@ -56,11 +64,14 @@ class ThemeInfoRebuildSubscriber implements EventSubscriberInterface {
    *   The current user.
    * @param \Drupal\Core\Extension\ThemeHandlerInterface $theme_handler
    *   The theme handler.
+   * @param Drupal\Core\Messenger\MessengerInterface $messenger
+   *   The messenger service.
    */
-  public function __construct(ConfigFactoryInterface $config, AccountProxyInterface $account, ThemeHandlerInterface $theme_handler) {
+  public function __construct(ConfigFactoryInterface $config, AccountProxyInterface $account, ThemeHandlerInterface $theme_handler, MessengerInterface $messenger) {
     $this->config = $config->get('devel.settings');
     $this->account = $account;
     $this->themeHandler = $theme_handler;
+    $this->messenger = $messenger;
   }
 
   /**
@@ -99,7 +110,7 @@ class ThemeInfoRebuildSubscriber implements EventSubscriberInterface {
       if (!$session->has($this->notificationFlag)) {
         $session->set($this->notificationFlag, TRUE);
         $message = $this->t('The theme information is being rebuilt on every request. Remember to <a href=":url">turn off</a> this feature on production websites.', [':url' => Url::fromRoute('devel.admin_settings')->toString()]);
-        drupal_set_message($message, 'warning', TRUE);
+        $this->messenger->addMessage($message, 'warning', TRUE);
       }
     }
   }
diff --git a/src/Form/ConfigEditor.php b/src/Form/ConfigEditor.php
index e4fe88c..c70d9a1 100644
--- a/src/Form/ConfigEditor.php
+++ b/src/Form/ConfigEditor.php
@@ -7,13 +7,41 @@ use Drupal\Component\Serialization\Yaml;
 use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\Core\Url;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Edit config variable form.
  */
 class ConfigEditor extends FormBase {
 
+  /**
+   * The messenger service.
+   *
+   * @var Drupal\Core\Messenger\MessengerInterface
+   */
+  protected $messenger;
+
+  /**
+   * Constructs a new ConfigEditor form object.
+   *
+   * @param Drupal\Core\Messenger\MessengerInterface $messenger
+   *   The messenger service.
+   */
+  public function __construct(MessengerInterface $messenger) {
+    $this->messenger = $messenger;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('messenger')
+    );
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -28,14 +56,14 @@ class ConfigEditor extends FormBase {
     $config = $this->config($config_name);
 
     if ($config === FALSE || $config->isNew()) {
-      drupal_set_message(t('Config @name does not exist in the system.', array('@name' => $config_name)), 'error');
+      $this->messenger->addMessage($this->t('Config @name does not exist in the system.', array('@name' => $config_name)), 'error');
       return;
     }
 
     $data = $config->getOriginal();
 
     if (empty($data)) {
-      drupal_set_message(t('Config @name exists but has no data.', array('@name' => $config_name)), 'warning');
+      $this->messenger->addMessage($this->t('Config @name exists but has no data.', array('@name' => $config_name)), 'warning');
       return;
     }
 
@@ -43,7 +71,7 @@ class ConfigEditor extends FormBase {
       $output = Yaml::encode($data);
     }
     catch (InvalidDataTypeException $e) {
-      drupal_set_message(t('Invalid data detected for @name : %error', array('@name' => $config_name, '%error' => $e->getMessage())), 'error');
+      $this->messenger->addMessage($this->t('Invalid data detected for @name : %error', array('@name' => $config_name, '%error' => $e->getMessage())), 'error');
       return;
     }
 
@@ -112,13 +140,13 @@ class ConfigEditor extends FormBase {
     $values = $form_state->getValues();
     try {
       $this->configFactory()->getEditable($values['name'])->setData($values['parsed_value'])->save();
-      drupal_set_message($this->t('Configuration variable %variable was successfully saved.', array('%variable' => $values['name'])));
+      $this->messenger->addMessage($this->t('Configuration variable %variable was successfully saved.', array('%variable' => $values['name'])));
       $this->logger('devel')->info('Configuration variable %variable was successfully saved.', array('%variable' => $values['name']));
 
       $form_state->setRedirectUrl(Url::fromRoute('devel.configs_list'));
     }
     catch (\Exception $e) {
-      drupal_set_message($e->getMessage(), 'error');
+      $this->messenger->addMessage($e->getMessage(), 'error');
       $this->logger('devel')->error('Error saving configuration variable %variable : %error.', array('%variable' => $values['name'], '%error' => $e->getMessage()));
     }
   }
diff --git a/src/Form/DevelReinstall.php b/src/Form/DevelReinstall.php
index 109e40b..74c94f0 100644
--- a/src/Form/DevelReinstall.php
+++ b/src/Form/DevelReinstall.php
@@ -5,6 +5,7 @@ namespace Drupal\devel\Form;
 use Drupal\Core\Extension\ModuleInstallerInterface;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Messenger\MessengerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -19,14 +20,24 @@ class DevelReinstall extends FormBase {
    */
   protected $moduleInstaller;
 
+  /**
+   * The messenger service.
+   *
+   * @var Drupal\Core\Messenger\MessengerInterface
+   */
+  protected $messenger;
+
   /**
    * Constructs a new DevelReinstall form.
    *
    * @param \Drupal\Core\Extension\ModuleInstallerInterface $module_installer
    *   The module installer.
+   * @param Drupal\Core\Messenger\MessengerInterface $messenger
+   *   The messenger service.
    */
-  public function __construct(ModuleInstallerInterface $module_installer) {
+  public function __construct(ModuleInstallerInterface $module_installer, MessengerInterface $messenger) {
     $this->moduleInstaller = $module_installer;
+    $this->messenger = $messenger;
   }
 
   /**
@@ -144,10 +155,10 @@ class DevelReinstall extends FormBase {
       $reinstall = array_keys(array_filter($modules));
       $this->moduleInstaller->uninstall($reinstall, FALSE);
       $this->moduleInstaller->install($reinstall, FALSE);
-      drupal_set_message($this->t('Uninstalled and installed: %names.', array('%names' => implode(', ', $reinstall))));
+      $this->messenger->addMessage($this->t('Uninstalled and installed: %names.', array('%names' => implode(', ', $reinstall))));
     }
     catch (\Exception $e) {
-      drupal_set_message($this->t('Unable to reinstall modules. Error: %error.', array('%error' => $e->getMessage())), 'error');
+      $this->messenger->addMessage($this->t('Unable to reinstall modules. Error: %error.', array('%error' => $e->getMessage())), 'error');
     }
   }
 
diff --git a/src/Form/RouterRebuildConfirmForm.php b/src/Form/RouterRebuildConfirmForm.php
index a1daf89..4d5da89 100644
--- a/src/Form/RouterRebuildConfirmForm.php
+++ b/src/Form/RouterRebuildConfirmForm.php
@@ -5,6 +5,7 @@ namespace Drupal\devel\Form;
 use Drupal\Core\Form\ConfirmFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Routing\RouteBuilderInterface;
+use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\Core\Url;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -20,14 +21,24 @@ class RouterRebuildConfirmForm extends ConfirmFormBase {
    */
   protected $routeBuilder;
 
+  /**
+   * The messenger service.
+   *
+   * @var Drupal\Core\Messenger\MessengerInterface
+   */
+  protected $messenger;
+
   /**
    * Constructs a new RouterRebuildConfirmForm object.
    *
    * @param \Drupal\Core\Routing\RouteBuilderInterface $route_builder
    *   The route builder service.
+   * @param Drupal\Core\Messenger\MessengerInterface $messenger
+   *   The messenger service.
    */
-  public function __construct(RouteBuilderInterface $route_builder) {
+  public function __construct(RouteBuilderInterface $route_builder, MessengerInterface $messenger) {
     $this->routeBuilder = $route_builder;
+    $this->messenger = $messenger;
   }
 
   /**
@@ -79,7 +90,7 @@ class RouterRebuildConfirmForm extends ConfirmFormBase {
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $this->routeBuilder->rebuild();
-    drupal_set_message($this->t('The router has been rebuilt.'));
+    $this->messenger->addMessage($this->t('The router has been rebuilt.'));
     $form_state->setRedirect('<front>');
   }
 
diff --git a/src/Form/SystemStateEdit.php b/src/Form/SystemStateEdit.php
index d4ba0ed..5d16419 100644
--- a/src/Form/SystemStateEdit.php
+++ b/src/Form/SystemStateEdit.php
@@ -6,6 +6,7 @@ use Drupal\Component\Serialization\Exception\InvalidDataTypeException;
 use Drupal\Component\Serialization\Yaml;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\Core\State\StateInterface;
 use Drupal\Core\Url;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -22,14 +23,24 @@ class SystemStateEdit extends FormBase {
    */
   protected $state;
 
+  /**
+   * The messenger service.
+   *
+   * @var Drupal\Core\Messenger\MessengerInterface
+   */
+  protected $messenger;
+
   /**
    * Constructs a new SystemStateEdit object.
    *
    * @param \Drupal\Core\State\StateInterface $state
    *   The state service.
+   * @param Drupal\Core\Messenger\MessengerInterface $messenger
+   *   The messenger service.
    */
-  public function __construct(StateInterface $state) {
+  public function __construct(StateInterface $state, MessengerInterface $messenger) {
     $this->state = $state;
+    $this->messenger = $messenger;
   }
 
   /**
@@ -37,7 +48,8 @@ class SystemStateEdit extends FormBase {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('state')
+      $container->get('state'),
+      $container->get('messenger')
     );
   }
 
@@ -56,7 +68,7 @@ class SystemStateEdit extends FormBase {
     $old_value = $this->state->get($state_name);
 
     if (!isset($old_value)) {
-      drupal_set_message(t('State @name does not exist in the system.', array('@name' => $state_name)), 'warning');
+      $this->messenger->addMessage($this->t('State @name does not exist in the system.', array('@name' => $state_name)), 'warning');
       return;
     }
 
@@ -64,7 +76,7 @@ class SystemStateEdit extends FormBase {
     $disabled = !$this->checkObject($old_value);
 
     if ($disabled) {
-      drupal_set_message(t('Only simple structures are allowed to be edited. State @name contains objects.', array('@name' => $state_name)), 'warning');
+      $this->messenger->addMessage($this->t('Only simple structures are allowed to be edited. State @name contains objects.', array('@name' => $state_name)), 'warning');
     }
 
     // First we will show the user the content of the variable about to be edited.
@@ -82,7 +94,7 @@ class SystemStateEdit extends FormBase {
         $transport = 'yaml';
       }
       catch (InvalidDataTypeException $e) {
-        drupal_set_message(t('Invalid data detected for @name : %error', array('@name' => $state_name, '%error' => $e->getMessage())), 'error');
+        $this->messenger->addMessage($this->t('Invalid data detected for @name : %error', array('@name' => $state_name, '%error' => $e->getMessage())), 'error');
         return;
       }
     }
@@ -155,7 +167,7 @@ class SystemStateEdit extends FormBase {
 
     $form_state->setRedirectUrl(Url::fromRoute('devel.state_system_page'));
 
-    drupal_set_message($this->t('Variable %variable was successfully edited.', array('%variable' => $values['state_name'])));
+    $this->messenger->addMessage($this->t('Variable %variable was successfully edited.', array('%variable' => $values['state_name'])));
     $this->logger('devel')->info('Variable %variable was successfully edited.', array('%variable' => $values['state_name']));
   }
 
diff --git a/webprofiler/src/Form/ConfigForm.php b/webprofiler/src/Form/ConfigForm.php
index e99e216..f05a9a7 100644
--- a/webprofiler/src/Form/ConfigForm.php
+++ b/webprofiler/src/Form/ConfigForm.php
@@ -5,6 +5,7 @@ namespace Drupal\webprofiler\Form;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\webprofiler\Profiler\ProfilerStorageManager;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpKernel\Profiler\Profiler;
@@ -29,6 +30,13 @@ class ConfigForm extends ConfigFormBase {
    */
   private $storageManager;
 
+  /**
+   * The messenger service.
+   *
+   * @var Drupal\Core\Messenger\MessengerInterface
+   */
+  protected $messenger;
+
   /**
    * {@inheritdoc}
    */
@@ -37,7 +45,8 @@ class ConfigForm extends ConfigFormBase {
       $container->get('config.factory'),
       $container->get('profiler'),
       $container->get('profiler.storage_manager'),
-      $container->getParameter('data_collector.templates')
+      $container->getParameter('data_collector.templates'),
+      $container->get('messenger')
     );
   }
 
@@ -46,13 +55,16 @@ class ConfigForm extends ConfigFormBase {
    * @param Profiler $profiler
    * @param \Drupal\webprofiler\Profiler\ProfilerStorageManager $storageManager
    * @param array $templates
+   * @param Drupal\Core\Messenger\MessengerInterface $messenger
+   *   The messenger service.
    */
-  public function __construct(ConfigFactoryInterface $config_factory, Profiler $profiler, ProfilerStorageManager $storageManager, $templates) {
+  public function __construct(ConfigFactoryInterface $config_factory, Profiler $profiler, ProfilerStorageManager $storageManager, $templates, MessengerInterface $messenger) {
     parent::__construct($config_factory);
 
     $this->profiler = $profiler;
     $this->templates = $templates;
     $this->storageManager = $storageManager;
+    $this->messenger = $messenger;
   }
 
   /**
@@ -206,7 +218,7 @@ class ConfigForm extends ConfigFormBase {
    */
   public function purge(array &$form, FormStateInterface $form_state) {
     $this->profiler->purge();
-    drupal_set_message($this->t('Profiles purged'));
+    $this->messenger->addMessage($this->t('Profiles purged'));
   }
 
   /**