diff --git a/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/java/org/dpppt/backend/sdk/ws/config/WSProdConfig.java b/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/java/org/dpppt/backend/sdk/ws/config/WSProdConfig.java
index 5c26c763..290831a6 100644
--- a/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/java/org/dpppt/backend/sdk/ws/config/WSProdConfig.java
+++ b/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/java/org/dpppt/backend/sdk/ws/config/WSProdConfig.java
@@ -50,8 +50,8 @@ public class WSProdConfig extends WSBaseConfig {
   @Value("${datasource.driverClassName}")
   String dataSourceDriver;
 
-  @Value("${datasource.failFast}")
-  String dataSourceFailFast;
+  @Value("${datasource.failTimeout}")
+  String dataSourceFailTimeout;
 
   @Value("${datasource.maximumPoolSize}")
   String dataSourceMaximumPoolSize;
@@ -84,6 +84,7 @@ public DataSource dataSource() {
     config.setMaxLifetime(Integer.parseInt(dataSourceMaxLifetime));
     config.setIdleTimeout(Integer.parseInt(dataSourceIdleTimeout));
     config.setConnectionTimeout(Integer.parseInt(dataSourceConnectionTimeout));
+    config.setInitializationFailTimeout(Integer.parseInt(dataSourceFailTimeout));
     return new HikariDataSource(config);
   }
 
diff --git a/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/resources/application.properties b/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/resources/application.properties
index 161a315f..4a172830 100644
--- a/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/resources/application.properties
+++ b/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/resources/application.properties
@@ -19,7 +19,7 @@ server.error.whitelabel.enabled=true
 # datasource.username=dpppt
 # datasource.password=dpppt
 # datasource.driverClassName=org.postgresql.ds.PGSimpleDataSource
-# datasource.failFast=true
+# datasource.failTimeout=1
 # datasource.maximumPoolSize=5
 # datasource.maxLifetime=1700000
 # datasource.idleTimeout=600000