diff --git a/dotnet/test/common/Environment/TestWebServer.cs b/dotnet/test/common/Environment/TestWebServer.cs
index b47585cd3c312..b97415ee1b8c5 100644
--- a/dotnet/test/common/Environment/TestWebServer.cs
+++ b/dotnet/test/common/Environment/TestWebServer.cs
@@ -25,6 +25,7 @@
 using System.Net.Http;
 using System.Runtime.InteropServices;
 using System.Text;
+using System.Threading.Tasks;
 
 namespace OpenQA.Selenium.Environment
 {
@@ -178,20 +179,7 @@ public void Stop()
         {
             if (webserverProcess != null)
             {
-                using (var httpClient = new HttpClient())
-                {
-                    try
-                    {
-                        using (httpClient.GetAsync(EnvironmentManager.Instance.UrlBuilder.LocalWhereIs("quitquitquit")).GetAwaiter().GetResult())
-                        {
-
-                        }
-                    }
-                    catch (HttpRequestException)
-                    {
-
-                    }
-                }
+                QuitNoThrow().GetAwaiter().GetResult();
 
                 try
                 {
@@ -207,6 +195,15 @@ public void Stop()
                     webserverProcess = null;
                 }
             }
+
+            static async Task QuitNoThrow()
+            {
+                using var httpClient = new HttpClient();
+
+                Task<HttpResponseMessage> getTask = httpClient.GetAsync(EnvironmentManager.Instance.UrlBuilder.LocalWhereIs("quitquitquit"));
+
+                await ((Task)getTask).ConfigureAwait(ConfigureAwaitOptions.SuppressThrowing);
+            }
         }
     }
 }