diff --git a/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/client/store/StoreClientSpringConfig.java b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/client/store/StoreClientSpringConfig.java
index db1a336..3f2cb1d 100644
--- a/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/client/store/StoreClientSpringConfig.java
+++ b/mii-process-feasibility/src/main/java/de/medizininformatik_initiative/process/feasibility/client/store/StoreClientSpringConfig.java
@@ -101,8 +101,8 @@ IGenericClient client(@Qualifier("store-client") FhirContext fhirContext,
         } else if (!isNullOrEmpty(oauthClientId) && !isNullOrEmpty(oauthClientSecret)
                 && !isNullOrEmpty(oauthTokenUrl)) {
             client.registerInterceptor(new OAuthInterceptor(oauthClientId, oauthClientSecret, oauthTokenUrl,
-                    Optional.of(oauthProxyHost), Optional.of(oauthProxyPort), Optional.of(oauthProxyUsername),
-                    Optional.of(oauthProxyPassword)));
+                    Optional.ofNullable(oauthProxyHost), Optional.ofNullable(oauthProxyPort),
+                    Optional.ofNullable(oauthProxyUsername), Optional.ofNullable(oauthProxyPassword)));
         }
 
         if (basicAuthUsername != null || basicAuthPassword != null) {