diff --git a/Netch/Controllers/MainController.cs b/Netch/Controllers/MainController.cs
index dfbb3fa3..6fe193bd 100644
--- a/Netch/Controllers/MainController.cs
+++ b/Netch/Controllers/MainController.cs
@@ -115,8 +115,8 @@ namespace Netch.Controllers
 
             var tasks = new[]
             {
-                Task.Run(() => ServerController?.StopAsync()),
-                Task.Run(() => ModeController?.StopAsync())
+                ServerController?.StopAsync() ?? Task.CompletedTask,
+                ModeController?.StopAsync() ?? Task.CompletedTask
             };
 
             try