diff --git a/magnolia-core/src/main/java/info/magnolia/objectfactory/configuration/ComponentProviderConfigurationBuilder.java b/magnolia-core/src/main/java/info/magnolia/objectfactory/configuration/ComponentProviderConfigurationBuilder.java
index fdb3fae..fc161a0 100644
--- a/magnolia-core/src/main/java/info/magnolia/objectfactory/configuration/ComponentProviderConfigurationBuilder.java
+++ b/magnolia-core/src/main/java/info/magnolia/objectfactory/configuration/ComponentProviderConfigurationBuilder.java
@@ -141,7 +141,7 @@ public class ComponentProviderConfigurationBuilder {
     protected ComponentConfiguration getConfigured(ComponentDefinition definition) {
         ConfiguredComponentConfiguration configuration = new ConfiguredComponentConfiguration();
         configuration.setType(classForName(definition.getType()));
-        configuration.setWorkspace(StringUtils.defaultIfEmpty(configuration.getWorkspace(), RepositoryConstants.CONFIG));
+        configuration.setWorkspace(StringUtils.defaultIfEmpty(definition.getWorkspace(), RepositoryConstants.CONFIG));
         configuration.setPath(definition.getPath());
         configuration.setObserved(false);
         configuration.setScope(definition.getScope());
@@ -152,7 +152,7 @@ public class ComponentProviderConfigurationBuilder {
     protected ComponentConfiguration getObserved(ComponentDefinition definition) {
         ConfiguredComponentConfiguration configuration = new ConfiguredComponentConfiguration();
         configuration.setType(classForName(definition.getType()));
-        configuration.setWorkspace(StringUtils.defaultIfEmpty(configuration.getWorkspace(), RepositoryConstants.CONFIG));
+        configuration.setWorkspace(StringUtils.defaultIfEmpty(definition.getWorkspace(), RepositoryConstants.CONFIG));
         configuration.setPath(definition.getPath());
         configuration.setObserved(true);
         configuration.setScope(definition.getScope());