diff --git a/lib/codegen/csharp/rest_sharp.dart b/lib/codegen/csharp/rest_sharp.dart
index c31a13a0..18a7219b 100644
--- a/lib/codegen/csharp/rest_sharp.dart
+++ b/lib/codegen/csharp/rest_sharp.dart
@@ -79,15 +79,19 @@ class Program
 
       result += kStringInit;
 
+      Uri uri =
+          getValidRequestUri(requestModel.url, requestModel.requestParams).$1!;
+      var baseUrl =
+          "${uri.scheme}://${uri.host}${uri.hasPort ? ":${uri.port}" : ""}${uri.hasFragment ? "#${uri.fragment}" : ""}";
+
       jj.Template templateInitClient = jj.Template(kInitClientTemplate);
-      String initClient =
-          templateInitClient.render({"baseUrl": getBaseUrl(requestModel.url)});
+      String initClient = templateInitClient.render({"baseUrl": baseUrl});
       result += initClient;
       result += kStringLineBreak;
 
       jj.Template templateMethodType = jj.Template(kMethodTypeTemplate);
       String methodType = templateMethodType.render({
-        "path": getUrlPath(requestModel.url),
+        "path": uri.path,
         "method": requestModel.method.name.replaceRange(
             0,
             1,
diff --git a/lib/utils/http_utils.dart b/lib/utils/http_utils.dart
index 1b86dfb1..63aa6181 100644
--- a/lib/utils/http_utils.dart
+++ b/lib/utils/http_utils.dart
@@ -160,13 +160,3 @@ String? formatBody(String? body, MediaType? mediaType) {
   }
   return null;
 }
-
-String getBaseUrl(String url) {
-  Uri uri = Uri.parse(url);
-  return "${uri.scheme}://${uri.host}${uri.hasPort ? ":${uri.port}" : ""}${uri.hasFragment ? "#${uri.fragment}" : ""}";
-}
-
-String getUrlPath(String url) {
-  Uri uri = Uri.parse(url);
-  return uri.path;
-}