diff --git a/src/libs/HeyGen/Generated/HeyGen.AssetsClient.g.cs b/src/libs/HeyGen/Generated/HeyGen.AssetsClient.g.cs
index 123ce3b..76dc45d 100644
--- a/src/libs/HeyGen/Generated/HeyGen.AssetsClient.g.cs
+++ b/src/libs/HeyGen/Generated/HeyGen.AssetsClient.g.cs
@@ -134,7 +134,10 @@ public AssetsClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
+            if (baseUri is not null)
+            {
+                HttpClient.BaseAddress ??= baseUri;
+            }
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::HeyGen.EndPointAuthorization>();
             Options = options ?? new global::HeyGen.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -247,7 +250,7 @@ private void SelectServer(global::HeyGen.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
+            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/HeyGen/Generated/HeyGen.CreateVideoApiClient.g.cs b/src/libs/HeyGen/Generated/HeyGen.CreateVideoApiClient.g.cs
index 3df827b..74953c0 100644
--- a/src/libs/HeyGen/Generated/HeyGen.CreateVideoApiClient.g.cs
+++ b/src/libs/HeyGen/Generated/HeyGen.CreateVideoApiClient.g.cs
@@ -134,7 +134,10 @@ public CreateVideoApiClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
+            if (baseUri is not null)
+            {
+                HttpClient.BaseAddress ??= baseUri;
+            }
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::HeyGen.EndPointAuthorization>();
             Options = options ?? new global::HeyGen.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -247,7 +250,7 @@ private void SelectServer(global::HeyGen.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
+            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/HeyGen/Generated/HeyGen.HeyGenClient.g.cs b/src/libs/HeyGen/Generated/HeyGen.HeyGenClient.g.cs
index b9864bc..1fe55c8 100644
--- a/src/libs/HeyGen/Generated/HeyGen.HeyGenClient.g.cs
+++ b/src/libs/HeyGen/Generated/HeyGen.HeyGenClient.g.cs
@@ -270,7 +270,10 @@ public HeyGenClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
+            if (baseUri is not null)
+            {
+                HttpClient.BaseAddress ??= baseUri;
+            }
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::HeyGen.EndPointAuthorization>();
             Options = options ?? new global::HeyGen.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -383,7 +386,7 @@ private void SelectServer(global::HeyGen.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
+            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/HeyGen/Generated/HeyGen.ListsClient.g.cs b/src/libs/HeyGen/Generated/HeyGen.ListsClient.g.cs
index 36dcc8a..ac0a21d 100644
--- a/src/libs/HeyGen/Generated/HeyGen.ListsClient.g.cs
+++ b/src/libs/HeyGen/Generated/HeyGen.ListsClient.g.cs
@@ -132,7 +132,10 @@ public ListsClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
+            if (baseUri is not null)
+            {
+                HttpClient.BaseAddress ??= baseUri;
+            }
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::HeyGen.EndPointAuthorization>();
             Options = options ?? new global::HeyGen.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::HeyGen.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
+            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/HeyGen/Generated/HeyGen.PersonalizedVideoClient.g.cs b/src/libs/HeyGen/Generated/HeyGen.PersonalizedVideoClient.g.cs
index 90dd94b..550b5af 100644
--- a/src/libs/HeyGen/Generated/HeyGen.PersonalizedVideoClient.g.cs
+++ b/src/libs/HeyGen/Generated/HeyGen.PersonalizedVideoClient.g.cs
@@ -135,7 +135,10 @@ public PersonalizedVideoClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
+            if (baseUri is not null)
+            {
+                HttpClient.BaseAddress ??= baseUri;
+            }
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::HeyGen.EndPointAuthorization>();
             Options = options ?? new global::HeyGen.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -248,7 +251,7 @@ private void SelectServer(global::HeyGen.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
+            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/HeyGen/Generated/HeyGen.StreamingApiClient.g.cs b/src/libs/HeyGen/Generated/HeyGen.StreamingApiClient.g.cs
index c96f56a..32c7107 100644
--- a/src/libs/HeyGen/Generated/HeyGen.StreamingApiClient.g.cs
+++ b/src/libs/HeyGen/Generated/HeyGen.StreamingApiClient.g.cs
@@ -134,7 +134,10 @@ public StreamingApiClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
+            if (baseUri is not null)
+            {
+                HttpClient.BaseAddress ??= baseUri;
+            }
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::HeyGen.EndPointAuthorization>();
             Options = options ?? new global::HeyGen.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -247,7 +250,7 @@ private void SelectServer(global::HeyGen.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
+            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/HeyGen/Generated/HeyGen.TalkingPhotoClient.g.cs b/src/libs/HeyGen/Generated/HeyGen.TalkingPhotoClient.g.cs
index c1356bc..a81bc81 100644
--- a/src/libs/HeyGen/Generated/HeyGen.TalkingPhotoClient.g.cs
+++ b/src/libs/HeyGen/Generated/HeyGen.TalkingPhotoClient.g.cs
@@ -134,7 +134,10 @@ public TalkingPhotoClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
+            if (baseUri is not null)
+            {
+                HttpClient.BaseAddress ??= baseUri;
+            }
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::HeyGen.EndPointAuthorization>();
             Options = options ?? new global::HeyGen.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -247,7 +250,7 @@ private void SelectServer(global::HeyGen.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
+            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/HeyGen/Generated/HeyGen.TemplateApiClient.g.cs b/src/libs/HeyGen/Generated/HeyGen.TemplateApiClient.g.cs
index f259086..bd50027 100644
--- a/src/libs/HeyGen/Generated/HeyGen.TemplateApiClient.g.cs
+++ b/src/libs/HeyGen/Generated/HeyGen.TemplateApiClient.g.cs
@@ -140,7 +140,10 @@ public TemplateApiClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
+            if (baseUri is not null)
+            {
+                HttpClient.BaseAddress ??= baseUri;
+            }
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::HeyGen.EndPointAuthorization>();
             Options = options ?? new global::HeyGen.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -253,7 +256,7 @@ private void SelectServer(global::HeyGen.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
+            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/HeyGen/Generated/HeyGen.UserClient.g.cs b/src/libs/HeyGen/Generated/HeyGen.UserClient.g.cs
index 72ff8d8..59aa52a 100644
--- a/src/libs/HeyGen/Generated/HeyGen.UserClient.g.cs
+++ b/src/libs/HeyGen/Generated/HeyGen.UserClient.g.cs
@@ -134,7 +134,10 @@ public UserClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
+            if (baseUri is not null)
+            {
+                HttpClient.BaseAddress ??= baseUri;
+            }
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::HeyGen.EndPointAuthorization>();
             Options = options ?? new global::HeyGen.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -247,7 +250,7 @@ private void SelectServer(global::HeyGen.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
+            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/HeyGen/Generated/HeyGen.VideoTranslateApiClient.g.cs b/src/libs/HeyGen/Generated/HeyGen.VideoTranslateApiClient.g.cs
index 12dfa85..85ba2b3 100644
--- a/src/libs/HeyGen/Generated/HeyGen.VideoTranslateApiClient.g.cs
+++ b/src/libs/HeyGen/Generated/HeyGen.VideoTranslateApiClient.g.cs
@@ -134,7 +134,10 @@ public VideoTranslateApiClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
+            if (baseUri is not null)
+            {
+                HttpClient.BaseAddress ??= baseUri;
+            }
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::HeyGen.EndPointAuthorization>();
             Options = options ?? new global::HeyGen.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -247,7 +250,7 @@ private void SelectServer(global::HeyGen.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
+            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
         }
 
         private global::System.Uri? ResolveBaseUri(
diff --git a/src/libs/HeyGen/Generated/HeyGen.WebhooksClient.g.cs b/src/libs/HeyGen/Generated/HeyGen.WebhooksClient.g.cs
index 8633ca7..6c6d3f2 100644
--- a/src/libs/HeyGen/Generated/HeyGen.WebhooksClient.g.cs
+++ b/src/libs/HeyGen/Generated/HeyGen.WebhooksClient.g.cs
@@ -134,7 +134,10 @@ public WebhooksClient(
         {
 
             HttpClient = httpClient ?? new global::System.Net.Http.HttpClient();
-            HttpClient.BaseAddress ??= baseUri ?? new global::System.Uri(DefaultBaseUrl);
+            if (baseUri is not null)
+            {
+                HttpClient.BaseAddress ??= baseUri;
+            }
             Authorizations = authorizations ?? new global::System.Collections.Generic.List<global::HeyGen.EndPointAuthorization>();
             Options = options ?? new global::HeyGen.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -247,7 +250,7 @@ private void SelectServer(global::HeyGen.AutoSDKServer? server)
                 return explicitBaseUri;
             }
 
-            return ResolveSelectedServer()?.Uri ?? HttpClient.BaseAddress;
+            return ResolveSelectedServer()?.Uri ?? (s_availableServers.Length > 0 ? s_availableServers[0].Uri : HttpClient.BaseAddress);
         }
 
         private global::System.Uri? ResolveBaseUri(