diff --git a/TwitchDownloaderWPF/PageQueue.xaml.cs b/TwitchDownloaderWPF/PageQueue.xaml.cs
index c2fe862b..e372ff68 100644
--- a/TwitchDownloaderWPF/PageQueue.xaml.cs
+++ b/TwitchDownloaderWPF/PageQueue.xaml.cs
@@ -284,12 +284,14 @@ private void MenuItemRemoveTask_Click(object sender, RoutedEventArgs e)
 
         private static void RemoveTask(TwitchTask task)
         {
-            if (task.CanRun() || task.Status is TwitchTaskStatus.Running or TwitchTaskStatus.Waiting)
+            if (task.Status is TwitchTaskStatus.Running || (task.Status is TwitchTaskStatus.Waiting && !task.CanCancel))
             {
                 MessageBox.Show(Application.Current.MainWindow!, Translations.Strings.CancelTaskBeforeRemoving, Translations.Strings.TaskCouldNotBeRemoved, MessageBoxButton.OK, MessageBoxImage.Information);
                 return;
             }
 
+            task.Cancel();
+
             lock (taskLock)
             {
                 if (!taskList.Remove(task))