diff --git a/modules/sdc_tags/src/Controller/ComponentTaggingController.php b/modules/sdc_tags/src/Controller/ComponentTaggingController.php
index ecb6fdc754e5b22159d5ee9b1a803afdfe28e7a2..955bc681b8a233d00272a7c025868ffc63bf38e4 100644
--- a/modules/sdc_tags/src/Controller/ComponentTaggingController.php
+++ b/modules/sdc_tags/src/Controller/ComponentTaggingController.php
@@ -57,13 +57,11 @@ class ComponentTaggingController extends ControllerBase {
     ComponentTagPluginManager $component_tag_manager,
     ComponentPluginManager $component_manager,
     NoThemeComponentManager $no_theme_component_manager,
-    \Drupal\cl_editorial\NoThemeComponentManager $noThemeComponentManager,
   ) {
     $this->configFactory = $config_factory;
     $this->componentTagManager = $component_tag_manager;
     $this->componentManager = $component_manager;
     $this->noThemeComponentManager = $no_theme_component_manager;
-    $this->noThemeComponentManager = $noThemeComponentManager;
   }
 
   /**
@@ -74,7 +72,7 @@ class ComponentTaggingController extends ControllerBase {
       $container->get('config.factory'),
       $container->get('plugin.manager.sdc_tags.component_tag'),
       $container->get('plugin.manager.sdc'),
-      $this->noThemeComponentManager,
+      $container->get(NoThemeComponentManager::class),
     );
   }
 
diff --git a/src/Element/ComponentSelectorElement.php b/src/Element/ComponentSelectorElement.php
index d45fd15a59a8a6176bff07d9c763982de1edc59b..e5f286a0f907893e8f1505d9de17e5e9240987cc 100644
--- a/src/Element/ComponentSelectorElement.php
+++ b/src/Element/ComponentSelectorElement.php
@@ -46,7 +46,7 @@ class ComponentSelectorElement extends FormElement implements ContainerFactoryPl
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    $component_manager = $this->componentManager;
+    $component_manager = $container->get(NoThemeComponentManager::class);
     assert($component_manager instanceof NoThemeComponentManager);
     $file_url_generator = $container->get('file_url_generator');
     assert($file_url_generator instanceof FileUrlGeneratorInterface);