diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index fe8d453..cccc249 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -3,7 +3,7 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Nullable.props', '$(MSBuildThisFileDirectory)'))" />
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Elastic.Apm.Messaging.MassTransit/MassTransitDiagnosticListener.cs b/src/Elastic.Apm.Messaging.MassTransit/MassTransitDiagnosticListener.cs
index 36e79e5..d4e130b 100644
--- a/src/Elastic.Apm.Messaging.MassTransit/MassTransitDiagnosticListener.cs
+++ b/src/Elastic.Apm.Messaging.MassTransit/MassTransitDiagnosticListener.cs
@@ -112,7 +112,7 @@ private void HandleReceiveStart(Activity activity, object? context)
         private void HandleStop(ActivitySpanId? spanId, TimeSpan duration)
         {
             if (spanId.HasValue &&
-                _activities.TryRemove(spanId.Value, out IExecutionSegment executionSegment))
+                _activities.TryRemove(spanId.Value, out IExecutionSegment? executionSegment))
             {
                 executionSegment.Duration = duration.TotalMilliseconds;
                 executionSegment.End();