diff --git a/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/config/DSSBeanConfig.java b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/config/DSSBeanConfig.java
index 3cc9953..0c39e39 100644
--- a/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/config/DSSBeanConfig.java
+++ b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/config/DSSBeanConfig.java
@@ -85,28 +85,37 @@ public class DSSBeanConfig {
 	@Autowired
 	private DataSource dataSource;
 
-	// can be null
-	@Autowired(required = false)
-	private ProxyConfig proxyConfig;
+	@Bean(name = "proxyConfigFactory")
+	public ProxyConfigFactoryBean proxyConfigFactoryBean() {
+		return new ProxyConfigFactoryBean();
+	}
+	@Bean
+	public ProxyConfig proxyConfig() {
+		try {
+			return proxyConfigFactoryBean().getObject();
+		} catch (Exception ex) {
+			throw new RuntimeException(ex);
+		}
+	}
 
 	@Bean
 	public CommonsDataLoader dataLoader() {
 		CommonsDataLoader dataLoader = new CommonsDataLoader();
-		dataLoader.setProxyConfig(proxyConfig);
+		dataLoader.setProxyConfig(proxyConfig());
 		return dataLoader;
 	}
 
 	@Bean
 	public TimestampDataLoader timestampDataLoader() {
 		TimestampDataLoader timestampDataLoader = new TimestampDataLoader();
-		timestampDataLoader.setProxyConfig(proxyConfig);
+		timestampDataLoader.setProxyConfig(proxyConfig());
 		return timestampDataLoader;
 	}
 
 	@Bean
 	public OCSPDataLoader ocspDataLoader() {
 		OCSPDataLoader ocspDataLoader = new OCSPDataLoader();
-		ocspDataLoader.setProxyConfig(proxyConfig);
+		ocspDataLoader.setProxyConfig(proxyConfig());
 		return ocspDataLoader;
 	}