diff --git a/pkg/codegen/operations.go b/pkg/codegen/operations.go
index fe37328480..01666ff38f 100644
--- a/pkg/codegen/operations.go
+++ b/pkg/codegen/operations.go
@@ -297,7 +297,7 @@ func (o *OperationDefinition) GetResponseTypeDefinitions() ([]ResponseTypeDefini
 					case StringInArray(contentTypeName, contentTypesHalJSON):
 						typeName = fmt.Sprintf("HALJSON%s", ToCamelCase(responseName))
 					// JSON:
-					case StringInArray(contentTypeName, contentTypesJSON):
+					case StringInArray(contentTypeName, contentTypesJSON) || util.IsMediaTypeJson(contentTypeName):
 						typeName = fmt.Sprintf("JSON%s", ToCamelCase(responseName))
 					// YAML:
 					case StringInArray(contentTypeName, contentTypesYAML):