diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java
index 27a6716eceb8..ad892917c701 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java
@@ -339,6 +339,9 @@ public class CodegenConfigurator {
             if (dynamicProperties.containsKey(opt)) {
                 codegenConfig.additionalProperties().put(opt, dynamicProperties.get(opt));
             }
+            else if(systemProperties.containsKey(opt)) {
+                codegenConfig.additionalProperties().put(opt, systemProperties.get(opt).toString());
+            }
         }
     }