diff --git a/datasophon-worker/src/main/java/com/datasophon/worker/handler/ConfigureServiceHandler.java b/datasophon-worker/src/main/java/com/datasophon/worker/handler/ConfigureServiceHandler.java
index 04259c07..98481eda 100644
--- a/datasophon-worker/src/main/java/com/datasophon/worker/handler/ConfigureServiceHandler.java
+++ b/datasophon-worker/src/main/java/com/datasophon/worker/handler/ConfigureServiceHandler.java
@@ -118,9 +118,6 @@ public ExecResult configure(Map<Generators, List<ServiceConfig>> configFileMap,
                     if (Constants.CUSTOM.equals(config.getConfigType())) {
                         addToCustomList(iterator, customConfList, config);
                     }
-                    if (!config.isRequired() && !Constants.CUSTOM.equals(config.getConfigType())) {
-                        iterator.remove();
-                    }
                     if (config.getValue() instanceof Boolean || config.getValue() instanceof Integer) {
                         logger.info("Convert boolean and integer to string");
                         config.setValue(config.getValue().toString());