diff --git a/src/SharpIDE.Application/Features/Run/RunService.cs b/src/SharpIDE.Application/Features/Run/RunService.cs
index d32acd7..cd9184a 100644
--- a/src/SharpIDE.Application/Features/Run/RunService.cs
+++ b/src/SharpIDE.Application/Features/Run/RunService.cs
@@ -70,6 +70,8 @@ public class RunService
 			}
 
 			await logsDrained.Task;
+			project.RunningCancellationTokenSource.Dispose();
+			project.RunningCancellationTokenSource = null;
 			project.Running = false;
 			GlobalEvents.InvokeProjectsRunningChanged();
 
@@ -88,7 +90,5 @@ public class RunService
 		if (project.RunningCancellationTokenSource is null) throw new InvalidOperationException($"Project {project.Name} does not have a running cancellation token source.");
 
 		await project.RunningCancellationTokenSource.CancelAsync();
-		project.RunningCancellationTokenSource.Dispose();
-		project.RunningCancellationTokenSource = null;
 	}
 }