diff --git a/src/libs/Letta/Generated/Letta.AgentsClient.g.cs b/src/libs/Letta/Generated/Letta.AgentsClient.g.cs
index 9c7dd581..562123ba 100644
--- a/src/libs/Letta/Generated/Letta.AgentsClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.AgentsClient.g.cs
@@ -132,7 +132,10 @@ public AgentsClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.ArchivesClient.g.cs b/src/libs/Letta/Generated/Letta.ArchivesClient.g.cs
index 95dd4954..30e70641 100644
--- a/src/libs/Letta/Generated/Letta.ArchivesClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.ArchivesClient.g.cs
@@ -132,7 +132,10 @@ public ArchivesClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.BlocksClient.g.cs b/src/libs/Letta/Generated/Letta.BlocksClient.g.cs
index eaf4f52f..699cc5d2 100644
--- a/src/libs/Letta/Generated/Letta.BlocksClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.BlocksClient.g.cs
@@ -132,7 +132,10 @@ public BlocksClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.ChatClient.g.cs b/src/libs/Letta/Generated/Letta.ChatClient.g.cs
index 40248e89..063e7f20 100644
--- a/src/libs/Letta/Generated/Letta.ChatClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.ChatClient.g.cs
@@ -132,7 +132,10 @@ public ChatClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.ClientSideAccessTokensClient.g.cs b/src/libs/Letta/Generated/Letta.ClientSideAccessTokensClient.g.cs
index 62f26489..484ceb93 100644
--- a/src/libs/Letta/Generated/Letta.ClientSideAccessTokensClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.ClientSideAccessTokensClient.g.cs
@@ -132,7 +132,10 @@ public ClientSideAccessTokensClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.ConversationsClient.g.cs b/src/libs/Letta/Generated/Letta.ConversationsClient.g.cs
index a299229a..40913383 100644
--- a/src/libs/Letta/Generated/Letta.ConversationsClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.ConversationsClient.g.cs
@@ -132,7 +132,10 @@ public ConversationsClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.DeviceStorageClient.g.cs b/src/libs/Letta/Generated/Letta.DeviceStorageClient.g.cs
index 680cbb82..3857e029 100644
--- a/src/libs/Letta/Generated/Letta.DeviceStorageClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.DeviceStorageClient.g.cs
@@ -132,7 +132,10 @@ public DeviceStorageClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.EmbeddingsClient.g.cs b/src/libs/Letta/Generated/Letta.EmbeddingsClient.g.cs
index 672628d3..a94d91e8 100644
--- a/src/libs/Letta/Generated/Letta.EmbeddingsClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.EmbeddingsClient.g.cs
@@ -132,7 +132,10 @@ public EmbeddingsClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.EnvironmentsClient.g.cs b/src/libs/Letta/Generated/Letta.EnvironmentsClient.g.cs
index 2ce06470..e884845a 100644
--- a/src/libs/Letta/Generated/Letta.EnvironmentsClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.EnvironmentsClient.g.cs
@@ -132,7 +132,10 @@ public EnvironmentsClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.FeedsClient.g.cs b/src/libs/Letta/Generated/Letta.FeedsClient.g.cs
index 0413c789..68af592e 100644
--- a/src/libs/Letta/Generated/Letta.FeedsClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.FeedsClient.g.cs
@@ -132,7 +132,10 @@ public FeedsClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.FoldersClient.g.cs b/src/libs/Letta/Generated/Letta.FoldersClient.g.cs
index c74df6e8..98f8a3c9 100644
--- a/src/libs/Letta/Generated/Letta.FoldersClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.FoldersClient.g.cs
@@ -132,7 +132,10 @@ public FoldersClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.HealthClient.g.cs b/src/libs/Letta/Generated/Letta.HealthClient.g.cs
index 735769c7..a31b0422 100644
--- a/src/libs/Letta/Generated/Letta.HealthClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.HealthClient.g.cs
@@ -132,7 +132,10 @@ public HealthClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.InternalAgentsClient.g.cs b/src/libs/Letta/Generated/Letta.InternalAgentsClient.g.cs
index 185e7e2e..f0f1b1d4 100644
--- a/src/libs/Letta/Generated/Letta.InternalAgentsClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.InternalAgentsClient.g.cs
@@ -132,7 +132,10 @@ public InternalAgentsClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.InternalBlocksClient.g.cs b/src/libs/Letta/Generated/Letta.InternalBlocksClient.g.cs
index 7762481d..1f16f23d 100644
--- a/src/libs/Letta/Generated/Letta.InternalBlocksClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.InternalBlocksClient.g.cs
@@ -132,7 +132,10 @@ public InternalBlocksClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.InternalRunsClient.g.cs b/src/libs/Letta/Generated/Letta.InternalRunsClient.g.cs
index bd895055..3de523a0 100644
--- a/src/libs/Letta/Generated/Letta.InternalRunsClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.InternalRunsClient.g.cs
@@ -132,7 +132,10 @@ public InternalRunsClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.InternalTemplatesClient.g.cs b/src/libs/Letta/Generated/Letta.InternalTemplatesClient.g.cs
index 9bba9f9d..18e50954 100644
--- a/src/libs/Letta/Generated/Letta.InternalTemplatesClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.InternalTemplatesClient.g.cs
@@ -132,7 +132,10 @@ public InternalTemplatesClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.JobsClient.g.cs b/src/libs/Letta/Generated/Letta.JobsClient.g.cs
index 0fa88788..aed64138 100644
--- a/src/libs/Letta/Generated/Letta.JobsClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.JobsClient.g.cs
@@ -132,7 +132,10 @@ public JobsClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.LettaClient.g.cs b/src/libs/Letta/Generated/Letta.LettaClient.g.cs
index 8335f3a9..26027934 100644
--- a/src/libs/Letta/Generated/Letta.LettaClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.LettaClient.g.cs
@@ -462,7 +462,10 @@ public LettaClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -575,7 +578,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.McpServersClient.g.cs b/src/libs/Letta/Generated/Letta.McpServersClient.g.cs
index 32257a6c..5c5b7a02 100644
--- a/src/libs/Letta/Generated/Letta.McpServersClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.McpServersClient.g.cs
@@ -132,7 +132,10 @@ public McpServersClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.MemoryFilesClient.g.cs b/src/libs/Letta/Generated/Letta.MemoryFilesClient.g.cs
index dbbbaaae..03ae69cd 100644
--- a/src/libs/Letta/Generated/Letta.MemoryFilesClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.MemoryFilesClient.g.cs
@@ -132,7 +132,10 @@ public MemoryFilesClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.MessagesClient.g.cs b/src/libs/Letta/Generated/Letta.MessagesClient.g.cs
index 7042ac47..cf3b13c7 100644
--- a/src/libs/Letta/Generated/Letta.MessagesClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.MessagesClient.g.cs
@@ -132,7 +132,10 @@ public MessagesClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.MetadataClient.g.cs b/src/libs/Letta/Generated/Letta.MetadataClient.g.cs
index 86028e25..c1dcdd95 100644
--- a/src/libs/Letta/Generated/Letta.MetadataClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.MetadataClient.g.cs
@@ -132,7 +132,10 @@ public MetadataClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.ModelsClient.g.cs b/src/libs/Letta/Generated/Letta.ModelsClient.g.cs
index 951e1de3..e0f39708 100644
--- a/src/libs/Letta/Generated/Letta.ModelsClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.ModelsClient.g.cs
@@ -132,7 +132,10 @@ public ModelsClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.PassagesClient.g.cs b/src/libs/Letta/Generated/Letta.PassagesClient.g.cs
index 38b22741..07214312 100644
--- a/src/libs/Letta/Generated/Letta.PassagesClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.PassagesClient.g.cs
@@ -132,7 +132,10 @@ public PassagesClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.PipelinesClient.g.cs b/src/libs/Letta/Generated/Letta.PipelinesClient.g.cs
index a15a6704..31e96966 100644
--- a/src/libs/Letta/Generated/Letta.PipelinesClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.PipelinesClient.g.cs
@@ -132,7 +132,10 @@ public PipelinesClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.ProjectsClient.g.cs b/src/libs/Letta/Generated/Letta.ProjectsClient.g.cs
index 51170cf9..79220d8e 100644
--- a/src/libs/Letta/Generated/Letta.ProjectsClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.ProjectsClient.g.cs
@@ -132,7 +132,10 @@ public ProjectsClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.ProvidersClient.g.cs b/src/libs/Letta/Generated/Letta.ProvidersClient.g.cs
index 76de66e8..68797f18 100644
--- a/src/libs/Letta/Generated/Letta.ProvidersClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.ProvidersClient.g.cs
@@ -132,7 +132,10 @@ public ProvidersClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.RunsClient.g.cs b/src/libs/Letta/Generated/Letta.RunsClient.g.cs
index 5b6d52d4..51da53dc 100644
--- a/src/libs/Letta/Generated/Letta.RunsClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.RunsClient.g.cs
@@ -132,7 +132,10 @@ public RunsClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.SandboxesClient.g.cs b/src/libs/Letta/Generated/Letta.SandboxesClient.g.cs
index ef0ca980..5a232580 100644
--- a/src/libs/Letta/Generated/Letta.SandboxesClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.SandboxesClient.g.cs
@@ -132,7 +132,10 @@ public SandboxesClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.ScheduledMessagesClient.g.cs b/src/libs/Letta/Generated/Letta.ScheduledMessagesClient.g.cs
index caa28363..a6d8d64c 100644
--- a/src/libs/Letta/Generated/Letta.ScheduledMessagesClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.ScheduledMessagesClient.g.cs
@@ -132,7 +132,10 @@ public ScheduledMessagesClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.StepsClient.g.cs b/src/libs/Letta/Generated/Letta.StepsClient.g.cs
index 7a3d5961..8dd65c70 100644
--- a/src/libs/Letta/Generated/Letta.StepsClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.StepsClient.g.cs
@@ -132,7 +132,10 @@ public StepsClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.TagClient.g.cs b/src/libs/Letta/Generated/Letta.TagClient.g.cs
index 3eeca1c4..344b4cc6 100644
--- a/src/libs/Letta/Generated/Letta.TagClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.TagClient.g.cs
@@ -132,7 +132,10 @@ public TagClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.TemplatesClient.g.cs b/src/libs/Letta/Generated/Letta.TemplatesClient.g.cs
index 520380ef..8913a908 100644
--- a/src/libs/Letta/Generated/Letta.TemplatesClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.TemplatesClient.g.cs
@@ -132,7 +132,10 @@ public TemplatesClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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/Letta/Generated/Letta.ToolsClient.g.cs b/src/libs/Letta/Generated/Letta.ToolsClient.g.cs
index 7228c577..c589277c 100644
--- a/src/libs/Letta/Generated/Letta.ToolsClient.g.cs
+++ b/src/libs/Letta/Generated/Letta.ToolsClient.g.cs
@@ -132,7 +132,10 @@ public ToolsClient(
         {
 
             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::Letta.EndPointAuthorization>();
             Options = options ?? new global::Letta.AutoSDKClientOptions();
             _disposeHttpClient = disposeHttpClient;
@@ -245,7 +248,7 @@ private void SelectServer(global::Letta.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(