diff --git a/src/MailsystemManager.php b/src/MailsystemManager.php
index 3b9e9b0..4134795 100644
--- a/src/MailsystemManager.php
+++ b/src/MailsystemManager.php
@@ -34,13 +34,6 @@ class MailsystemManager extends MailManager {
   const MAILSYSTEM_MODULES_CONFIG = 'modules';
 
   /**
-   * Config object for mailsystem configuration.
-   *
-   * @var \Drupal\Core\Config\Config
-   */
-  protected $mailsystemConfig;
-
-  /**
    * @var \Drupal\Core\Theme\ThemeManagerInterface
    */
   protected $themeManager;
@@ -67,7 +60,6 @@ class MailsystemManager extends MailManager {
    */
   public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler, ConfigFactoryInterface $config_factory, LoggerChannelFactoryInterface $logger_factory, TranslationInterface $string_translation, ThemeManagerInterface $theme_manager, ThemeInitializationInterface $theme_initialization, Registry $default_theme_registry, Registry $mail_theme_registry) {
     parent::__construct($namespaces, $cache_backend, $module_handler, $config_factory, $logger_factory, $string_translation);
-    $this->mailsystemConfig = $config_factory->get('mailsystem.settings');
     $this->themeManager = $theme_manager;
     $this->themeInitialization = $theme_initialization;
     $this->defaultThemeRegistry = $default_theme_registry;
@@ -152,8 +144,10 @@ class MailsystemManager extends MailManager {
       'defaults'
     );
 
+    $config = $this->configFactory->get('mailsystem.settings');
+
     foreach($message_id_list as $message_id) {
-      $plugin_id = $this->mailsystemConfig->get($message_id);
+      $plugin_id = $config->get($message_id);
       if (!is_null($plugin_id)) {
         break;
       }
@@ -180,7 +174,7 @@ class MailsystemManager extends MailManager {
    * Retrieves the key of the theme used to render the emails.
    */
   public function getMailTheme() {
-    $theme = $this->mailsystemConfig->get('theme');
+    $theme = $this->configFactory->get('mailsystem.settings')->get('theme');
     switch ($theme) {
       case 'default':
         $theme = $this->configFactory->get('system.theme')->get('default');