diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
index c7e24e1ab9f..83c30af66df 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
@@ -683,9 +683,9 @@ public class DefaultCodegen {
 				}
 				property.items = cp;
 				if (property.items.isEnum) {
-					property.datatypeWithEnum = property.datatypeWithEnum.replace("String",
+					property.datatypeWithEnum = property.datatypeWithEnum.replace(property.items.baseType,
 							property.items.datatypeWithEnum);
-					property.defaultValue = property.defaultValue.replace("String", property.items.datatypeWithEnum);
+					property.defaultValue = property.defaultValue.replace(property.items.baseType, property.items.datatypeWithEnum);
 				}
 			}