diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java
index a7880f49618b..9e9d28958af3 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java
@@ -28,7 +28,6 @@ public class CodegenResponse implements IJsonSchemaValidationProperties {
     public boolean is4xx;
     public boolean is5xx;
     public String message;
-    public boolean isSuccessCode;
     public boolean hasMore;
     public List<Map<String, Object>> examples;
     public String dataType;
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
index 0123a541d108..c2cd91fc9b67 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -3800,7 +3800,6 @@ public class DefaultCodegen implements CodegenConfig {
                 default:
                     throw new RuntimeException("Invalid response code " + responseCode);
             }
-            r.isSuccessCode = r.code.startsWith("2");
         }
         Schema responseSchema;
         if (this.openAPI != null && this.openAPI.getComponents() != null) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java
index 38a3e7502a20..e58429a589fb 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java
@@ -318,7 +318,7 @@ public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenCo
         boolean addVoid = false;
         for (CodegenResponse response: responses) {
             // TODO: we should probably catch an exception here
-            if (response.isSuccessCode) {
+            if (response.is2xx) {
                 if (response.dataType != null) {
                     if (!firstReturnType) {
                         returnType.append(" | ");
diff --git a/modules/openapi-generator/src/main/resources/typescript/api/api.mustache b/modules/openapi-generator/src/main/resources/typescript/api/api.mustache
index 8e4b6d52a531..d61c0396d97b 100644
--- a/modules/openapi-generator/src/main/resources/typescript/api/api.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript/api/api.mustache
@@ -166,20 +166,20 @@ export class {{classname}}ResponseProcessor {
                 "{{{dataType}}}", "{{returnFormat}}"
             ) as {{{dataType}}};
             {{/isBinary}}
-            {{#isSuccessCode}}
+            {{#is2xx}}
             return body;
-            {{/isSuccessCode}}
-            {{^isSuccessCode}}
+            {{/is2xx}}
+            {{^is2xx}}
             throw new ApiException<{{{dataType}}}>({{code}}, body);
-            {{/isSuccessCode}}
+            {{/is2xx}}
             {{/dataType}}
             {{^dataType}}
-            {{#isSuccessCode}}
+            {{#is2xx}}
             return;
-            {{/isSuccessCode}}
-            {{^isSuccessCode}}
+            {{/is2xx}}
+            {{^is2xx}}
             throw new ApiException<string>(response.httpStatusCode, "{{message}}");
-            {{/isSuccessCode}}
+            {{/is2xx}}
             {{/dataType}}
         }
         {{/responses}}