diff --git a/TeslaSolarCharger/Server/Services/TeslaBleService.cs b/TeslaSolarCharger/Server/Services/TeslaBleService.cs
index f80429459..89b48a17c 100644
--- a/TeslaSolarCharger/Server/Services/TeslaBleService.cs
+++ b/TeslaSolarCharger/Server/Services/TeslaBleService.cs
@@ -145,6 +145,8 @@ private async Task<DtoBleResult> SendCommandToBle(DtoBleRequest request)
         using var client = new HttpClient();
         try
         {
+            //Default timeout of Tesla Command CLI is 21 seconds.
+            client.Timeout = TimeSpan.FromSeconds(22);
             var response = await client.PostAsJsonAsync(url, request.Parameters).ConfigureAwait(false);
             var responseContent = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
             if (!response.IsSuccessStatusCode)