diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java
index 29ceed98f88a..41c6e20c5c76 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java
@@ -521,6 +521,11 @@ public String toParamName(String name) {
             return parameterNameMapping.get(name);
         }
 
+        // do nothing if naming scheme is original (assuming parameter name mapping isn't set)
+        if (getParamNaming() == PARAM_NAMING_TYPE.original) {
+            return name;
+        }
+
         name = sanitizeName(name, "[^\\w$]");
 
         if ("_".equals(name)) {
@@ -540,6 +545,11 @@ public String toVarName(String name) {
             return nameMapping.get(name);
         }
 
+        // do nothing if naming scheme is original (assuming property name mapping isn't set)
+        if (getModelPropertyNaming() == MODEL_PROPERTY_NAMING_TYPE.original) {
+            return name;
+        }
+
         name = sanitizeName(name, "[^\\w$]");
 
         if ("_".equals(name)) {