diff --git a/eng/targets/CSharp.Common.targets b/eng/targets/CSharp.Common.targets
index 2d9deb5890..c9ef556f4d 100644
--- a/eng/targets/CSharp.Common.targets
+++ b/eng/targets/CSharp.Common.targets
@@ -13,6 +13,9 @@
$(NoWarn);RS0041
+
+
+ $(NoWarn);CA1416
(TaskContinuationOptions.RunContinuationsAsynchronously);
+ Completion = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
Completion.Task.ContinueWith(
(task, state) =>
{
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/CircuitGracefulTerminationTests.cs b/src/Components/test/E2ETest/ServerExecutionTests/CircuitGracefulTerminationTests.cs
index 69c20cb970..eb3340427e 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/CircuitGracefulTerminationTests.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/CircuitGracefulTerminationTests.cs
@@ -47,7 +47,7 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
Browser.MountTestComponent();
Browser.Equal("Current count: 0", () => Browser.FindElement(By.TagName("p")).Text);
- GracefulDisconnectCompletionSource = new TaskCompletionSource