diff --git a/src/NetSparkle.Samples.HandleEventsYourself/MainWindow.xaml.cs b/src/NetSparkle.Samples.HandleEventsYourself/MainWindow.xaml.cs
index d53a97b5..4e578d35 100644
--- a/src/NetSparkle.Samples.HandleEventsYourself/MainWindow.xaml.cs
+++ b/src/NetSparkle.Samples.HandleEventsYourself/MainWindow.xaml.cs
@@ -169,9 +169,10 @@ private async void UpdateAutomaticallyButton_Click(object sender, RoutedEventArg
             await _sparkle.CheckForUpdatesQuietly();
         }
 
-        private void _sparkle_FullUpdate_UpdateDetected(object sender, Events.UpdateDetectedEventArgs e)
+        private Task _sparkle_FullUpdate_UpdateDetected(object sender, Events.UpdateDetectedEventArgs e)
         {
             RunFullUpdateUpdateStatusLabel.Text = "Found update...";
+            return Task.CompletedTask;
         }
 
         private void _sparkle_FullUpdate_StartedDownloading(AppCastItem item, string path)
diff --git a/src/NetSparkle/NetSparkle.csproj b/src/NetSparkle/NetSparkle.csproj
index 7966853b..127a0ba4 100644
--- a/src/NetSparkle/NetSparkle.csproj
+++ b/src/NetSparkle/NetSparkle.csproj
@@ -19,6 +19,7 @@
     <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
     <RootNamespace>NetSparkleUpdater</RootNamespace>
     <PackageReleaseNotes>See https://github.com/NetSparkleUpdater/NetSparkle/releases for all release information and to file issues/pull requests for this project.</PackageReleaseNotes>
+      <NoWarn>VSTHRD200, VSTHRD100, VSTHRD002, VSTHRD001</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
     <IncludeSymbols>true</IncludeSymbols>
@@ -100,6 +101,7 @@
     <!--<PackageReference Include="BouncyCastle.Cryptography" Version="2.0.0" /> TODO: 3.0 -->
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.9.28" />
     <PackageReference Include="System.Text.Json" Version="8.0.0" />
 	  <PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
   </ItemGroup>
diff --git a/src/NetSparkle/SparkleUpdater.cs b/src/NetSparkle/SparkleUpdater.cs
index 22aa6e38..b229af1f 100644
--- a/src/NetSparkle/SparkleUpdater.cs
+++ b/src/NetSparkle/SparkleUpdater.cs
@@ -19,6 +19,7 @@
 using NetSparkleUpdater.AssemblyAccessors;
 using System.Text;
 using System.Globalization;
+using Microsoft.VisualStudio.Threading;
 #if (NETSTANDARD || NET6 || NET7 || NET8)
 using System.Runtime.InteropServices;
 #endif
@@ -1824,7 +1825,7 @@ private async Task<UpdateInfo> CheckForUpdates(bool isUserManuallyCheckingForUpd
                 // handling everything.
                 if (UpdateDetected != null)
                 {
-                    UpdateDetected(this, ev); // event's next action can change, here
+                    await UpdateDetected.InvokeAsync(this, ev); // event's next action can change, here
                     switch (ev.NextAction)
                     {
                         case NextUpdateAction.PerformUpdateUnattended:
@@ -2048,7 +2049,10 @@ private async void OnWorkerDoWork(object sender, DoWorkEventArgs e)
                                     LatestVersion = updates[0],
                                     AppCastItems = updates
                                 };
-                                UpdateDetected?.Invoke(this, ev);
+            
+                                if (UpdateDetected != null)
+                                    await UpdateDetected.InvokeAsync(this, ev);
+                                
                                 if (_cancelToken.IsCancellationRequested)
                                 {
                                     break;
diff --git a/src/NetSparkle/SparkleUpdaterEvents.cs b/src/NetSparkle/SparkleUpdaterEvents.cs
index b72a10b6..ff207d53 100644
--- a/src/NetSparkle/SparkleUpdaterEvents.cs
+++ b/src/NetSparkle/SparkleUpdaterEvents.cs
@@ -1,9 +1,9 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Net;
-using System.Text;
 using System.Diagnostics;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.Threading;
+using NetSparkleUpdater.Events;
 
 namespace NetSparkleUpdater
 {
@@ -13,6 +13,7 @@ public partial class SparkleUpdater : IDisposable
         /// This event will be raised when an update check is about to be started
         /// </summary>
         public event LoopStartedOperation LoopStarted;
+        
         /// <summary>
         /// This event will be raised when an update check has finished
         /// </summary>
@@ -22,11 +23,13 @@ public partial class SparkleUpdater : IDisposable
         /// Called when update check has just begun
         /// </summary>
         public event UpdateCheckStarted UpdateCheckStarted;
+        
         /// <summary>
         /// This event can be used to override the standard user interface
         /// process when an update is detected
         /// </summary>
-        public event UpdateDetected UpdateDetected;
+        public event AsyncEventHandler<UpdateDetectedEventArgs> UpdateDetected;
+        
         /// <summary>
         /// Called when update check is all done. <see cref="UpdateDetected"/> may have been 
         /// called between the start and end of the update check.