diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/JSON.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/JSON.mustache
index b80d95f938b..abab9159d79 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/JSON.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/JSON.mustache
@@ -65,6 +65,7 @@ public class JSON {
                 {{#children}}
                 classByDiscriminatorValue.put("{{name}}".toUpperCase(), {{classname}}.class);
                 {{/children}}
+                classByDiscriminatorValue.put("{{classname}}".toUpperCase(), {{classname}}.class);
                 return getClassByDiscriminator(
                             classByDiscriminatorValue,
                             getDiscriminatorValue(readElement, "{{discriminator}}"));
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/JSON.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/JSON.java
index f38a0d1de10..aa07fc781cc 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/JSON.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/JSON.java
@@ -54,6 +54,7 @@ public Class getClassForElement(JsonElement readElement) {
                 Map classByDiscriminatorValue = new HashMap();
                 classByDiscriminatorValue.put("Cat".toUpperCase(), Cat.class);
                 classByDiscriminatorValue.put("Dog".toUpperCase(), Dog.class);
+                classByDiscriminatorValue.put("Animal".toUpperCase(), Animal.class);
                 return getClassByDiscriminator(
                             classByDiscriminatorValue,
                             getDiscriminatorValue(readElement, "className"));