diff --git a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceComponent.java b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceComponent.java
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceComponent.java
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceComponent.java
@@ -20,6 +20,8 @@
 
 import java.util.List;
 
+import javax.enterprise.context.RequestScoped;
+
 import org.openbravo.client.kernel.BaseTemplateComponent;
 import org.openbravo.client.kernel.Template;
 
@@ -28,6 +30,7 @@
  * 
  * @author mtaal
  */
+@RequestScoped
 public class DataSourceComponent extends BaseTemplateComponent {
 
   private DataSourceService dataSourceService;