diff --git a/config-data-executor/src/main/java/org/micord/service/DownloadService.java b/config-data-executor/src/main/java/org/micord/service/DownloadService.java
index 0f58b36..f1f0ace 100644
--- a/config-data-executor/src/main/java/org/micord/service/DownloadService.java
+++ b/config-data-executor/src/main/java/org/micord/service/DownloadService.java
@@ -117,11 +117,17 @@ public class DownloadService {
 		return resultMap;
 	}
 
-	private String prepareRequestURL(DownloadRequest request, LocalDate startDate, LocalDate endDate) {
-		return request.getRequestURL()
-			.replace("${startDate}", startDate.toString())
-			.replace("${endDate}", endDate.toString())
-			.replace("${DB}", request.getSqlConnectionParams().getJdbcDatabase());
+	private String prepareRequestURL(DownloadRequest request, LocalDate startDate,
+																	 LocalDate endDate) {
+		String requestURL = request.getRequestURL();
+
+		if (startDate != null) {
+			requestURL = requestURL.replace("${startDate}", startDate.toString());
+		}
+		if (endDate != null) {
+			requestURL = requestURL.replace("${endDate}", endDate.toString());
+		}
+		return requestURL.replace("${DB}", request.getSqlConnectionParams().getJdbcDatabase());
 	}
 
 	private List<String[]> executeSqlQuery(Connection connection, String query) throws SQLException {