diff --git a/config-data-executor/src/main/java/org/micord/service/ApiService.java b/config-data-executor/src/main/java/org/micord/service/ApiService.java
index 9c0a393..01b3cee 100644
--- a/config-data-executor/src/main/java/org/micord/service/ApiService.java
+++ b/config-data-executor/src/main/java/org/micord/service/ApiService.java
@@ -13,6 +13,7 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.sql.SQLException;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -73,8 +74,8 @@ public class ApiService {
 		Requests config = configService.getConfig(methodName, Requests.class);
 
 		return Stream.concat(
-				config.getSqlDownloadRequests().stream(),
-				config.getAqlDownloadRequests().stream()
+				Optional.ofNullable(config.getSqlDownloadRequests()).orElse(Collections.emptyList()).stream(),
+				Optional.ofNullable(config.getAqlDownloadRequests()).orElse(Collections.emptyList()).stream()
 			)
 			.map(BaseDownloadRequest::getDownloadRequestType)
 			.distinct()