diff --git a/LANCommander.Client/Services/UpdateService.cs b/LANCommander.Client/Services/UpdateService.cs
index 85960322..4982f3d3 100644
--- a/LANCommander.Client/Services/UpdateService.cs
+++ b/LANCommander.Client/Services/UpdateService.cs
@@ -23,11 +23,12 @@ namespace LANCommander.Client.Services
 
         public async Task<SemVersion> CheckForUpdateAsync()
         {
-            var serverVersion = await Client.Launcher.CheckForUpdateAsync();
+            var updateVersion = await Client.Launcher.CheckForUpdateAsync();
 
-            OnUpdateAvailable?.Invoke(serverVersion);
+            if (updateVersion != null)
+                OnUpdateAvailable?.Invoke(updateVersion);
 
-            return serverVersion;
+            return updateVersion;
         }
 
         public async Task UpdateAsync(SemVersion version)