diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 7dff83718b0..1679d2a1285 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -14,7 +14,7 @@
     <PackageVersion Include="Moq" Version="4.18.4" />
     <PackageVersion Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
     <PackageVersion Include="ReportGenerator" Version="5.1.21" />
-    <PackageVersion Include="SonarAnalyzer.CSharp" Version="9.0.0.68202" />
+    <PackageVersion Include="SonarAnalyzer.CSharp" Version="9.1.0.70676" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.435" />
     <PackageVersion Include="System.ComponentModel.Annotations" Version="4.5.0" />
     <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="7.0.0" />
diff --git a/src/Polly.Core.Tests/Hedging/Controller/HedgingExecutionContextTests.cs b/src/Polly.Core.Tests/Hedging/Controller/HedgingExecutionContextTests.cs
index 38162137d19..4f8e97d87b4 100644
--- a/src/Polly.Core.Tests/Hedging/Controller/HedgingExecutionContextTests.cs
+++ b/src/Polly.Core.Tests/Hedging/Controller/HedgingExecutionContextTests.cs
@@ -132,8 +132,8 @@ public async Task TryWaitForCompletedExecutionAsync_ConcurrentExecution_Ok()
 
         _timeProvider.Advance(TimeSpan.FromDays(1));
         await context.TryWaitForCompletedExecutionAsync(TimeSpan.Zero);
-        await context.Tasks.First().ExecutionTaskSafe!;
-        context.Tasks.First().AcceptOutcome();
+        await context.Tasks[0].ExecutionTaskSafe!;
+        context.Tasks[0].AcceptOutcome();
     }
 
     [Fact]
@@ -152,7 +152,7 @@ public async Task TryWaitForCompletedExecutionAsync_SynchronousExecution_Ok()
         task.Wait(20).Should().BeFalse();
         _timeProvider.Advance(TimeSpan.FromDays(1));
         await task;
-        context.Tasks.First().AcceptOutcome();
+        context.Tasks[0].AcceptOutcome();
     }
 
     [Fact]
@@ -175,8 +175,8 @@ public async Task TryWaitForCompletedExecutionAsync_HedgedExecution_Ok()
         _timeProvider.DelayEntries.Last().Delay.Should().Be(hedgingDelay);
         _timeProvider.Advance(TimeSpan.FromDays(1));
         await task;
-        await context.Tasks.First().ExecutionTaskSafe!;
-        context.Tasks.First().AcceptOutcome();
+        await context.Tasks[0].ExecutionTaskSafe!;
+        context.Tasks[0].AcceptOutcome();
     }
 
     [Fact]
diff --git a/src/Polly.Core.Tests/Polly.Core.Tests.csproj b/src/Polly.Core.Tests/Polly.Core.Tests.csproj
index b055083bccb..b01cacac512 100644
--- a/src/Polly.Core.Tests/Polly.Core.Tests.csproj
+++ b/src/Polly.Core.Tests/Polly.Core.Tests.csproj
@@ -7,7 +7,7 @@
     <Nullable>enable</Nullable>
     <SkipPollyUsings>true</SkipPollyUsings>
     <Threshold>100</Threshold>
-    <NoWarn>$(NoWarn);SA1600;SA1204;SA1602</NoWarn>
+    <NoWarn>$(NoWarn);SA1600;SA1204;SA1602;S6608</NoWarn>
     <Include>[Polly.Core]*</Include>
   </PropertyGroup>
 
diff --git a/src/Polly.Core/Hedging/Controller/HedgingExecutionContext.cs b/src/Polly.Core/Hedging/Controller/HedgingExecutionContext.cs
index 719ec1e2cea..7abdb90b4ce 100644
--- a/src/Polly.Core/Hedging/Controller/HedgingExecutionContext.cs
+++ b/src/Polly.Core/Hedging/Controller/HedgingExecutionContext.cs
@@ -183,7 +183,7 @@ static async Task<Task> AwaitTask(TaskExecution task, bool continueOnCapturedCon
 
     private TaskExecution? TryRemoveExecutedTask()
     {
-        if (_executingTasks.FirstOrDefault(static v => v.ExecutionTaskSafe!.IsCompleted) is TaskExecution execution)
+        if (_executingTasks.Find(static v => v.ExecutionTaskSafe!.IsCompleted) is TaskExecution execution)
         {
             _executingTasks.Remove(execution);
             return execution;