diff -u b/src/Form/SwitchPageThemeSettingForm.php b/src/Form/SwitchPageThemeSettingForm.php
--- b/src/Form/SwitchPageThemeSettingForm.php
+++ b/src/Form/SwitchPageThemeSettingForm.php
@@ -7,7 +7,7 @@
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
-use Drupal\domain\DomainLoader;
+use Drupal\domain\DomainStorageInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -30,11 +30,11 @@
   protected $themeHandler;
 
   /**
-   * The Domain loader.
+   * The Domain storage service.
    *
-   * @var \Drupal\domain\DomainLoader
+   * @var \Drupal\domain\DomainStorageInterface
    */
-  protected $domainLoader;
+  protected $domainStorage;
 
   /**
    * The language manager.
@@ -46,11 +46,11 @@
   /**
    * {@inheritdoc}
    */
-  public function __construct(ModuleHandlerInterface $module_handler, ThemeHandlerInterface $theme_handler, DomainLoader $domain_loader = NULL, LanguageManagerInterface $language_manager = NULL) {
+  public function __construct(ModuleHandlerInterface $module_handler, ThemeHandlerInterface $theme_handler, DomainStorageInterface $domain_storage = NULL, LanguageManagerInterface $language_manager = NULL) {
     $this->moduleHandler = $module_handler;
     $this->themeHandler = $theme_handler;
-    if ($domain_loader) {
-      $this->domainLoader = $domain_loader;
+    if ($domain_storage) {
+      $this->domainStorage = $domain_storage;
     }
     if ($language_manager) {
       $this->languageManager = $language_manager;
@@ -63,8 +63,8 @@
   public static function create(ContainerInterface $container) {
     $domainServices = NULL;
     $languageServices = NULL;
-    if ($container->has('domain.loader')) {
-      $domainServices = $container->get('domain.loader');
+    if ($container->has('domain.negotiator')) {
+      $domainServices = $container->get('entity_type.manager')->getStorage('domain');
     }
     if ($container->has('language_manager')) {
       $languageServices = $container->get('language_manager');
@@ -213,7 +213,7 @@
 
       // Add Domains if domain module is available.
       if ($this->moduleHandler->moduleExists('domain')) {
-        foreach ($this->domainLoader->loadMultiple() as $domain_key => $domain) {
+        foreach ($this->domainStorage->loadMultiple() as $domain_key => $domain) {
           $domainNames[$domain_key] = $domain->getHostname();
         }