diff --git a/launcher/launch/TaskStepWrapper.cpp b/launcher/launch/TaskStepWrapper.cpp
index db9e8fad2..136057620 100644
--- a/launcher/launch/TaskStepWrapper.cpp
+++ b/launcher/launch/TaskStepWrapper.cpp
@@ -59,9 +59,7 @@ bool TaskStepWrapper::canAbort() const
 bool TaskStepWrapper::abort()
 {
     if (m_task && m_task->canAbort()) {
-        auto status = m_task->abort();
-        emitFailed("Aborted.");
-        return status;
+        return m_task->abort();
     }
     return Task::abort();
 }
diff --git a/launcher/minecraft/ComponentUpdateTask.cpp b/launcher/minecraft/ComponentUpdateTask.cpp
index bdfdcfbcc..5c0662545 100644
--- a/launcher/minecraft/ComponentUpdateTask.cpp
+++ b/launcher/minecraft/ComponentUpdateTask.cpp
@@ -38,6 +38,9 @@
  * If the component list changes, start over.
  */
 
+/*
+ * TODO: This task launches multiple other tasks. As such it should be converted to a ConcurrentTask
+ */
 ComponentUpdateTask::ComponentUpdateTask(Mode mode, Net::Mode netmode, PackProfile* list) : Task()
 {
     d.reset(new ComponentUpdateTaskData);
@@ -48,6 +51,29 @@ ComponentUpdateTask::ComponentUpdateTask(Mode mode, Net::Mode netmode, PackProfi
 
 ComponentUpdateTask::~ComponentUpdateTask() {}
 
+bool ComponentUpdateTask::canAbort() const
+{
+    for (const auto& status : d->remoteLoadStatusList) {
+        if (status.task && !status.task->canAbort()) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+bool ComponentUpdateTask::abort()
+{
+    bool aborted = true;
+    for (const auto& status : d->remoteLoadStatusList) {
+        if (status.task && !status.task->abort()) {
+            aborted = false;
+        }
+    }
+
+    return aborted;
+}
+
 void ComponentUpdateTask::executeTask()
 {
     qCDebug(instanceProfileResolveC) << "Loading components";
diff --git a/launcher/minecraft/ComponentUpdateTask.h b/launcher/minecraft/ComponentUpdateTask.h
index 64c55877b..c4c3fd3cc 100644
--- a/launcher/minecraft/ComponentUpdateTask.h
+++ b/launcher/minecraft/ComponentUpdateTask.h
@@ -17,6 +17,9 @@ class ComponentUpdateTask : public Task {
     explicit ComponentUpdateTask(Mode mode, Net::Mode netmode, PackProfile* list);
     virtual ~ComponentUpdateTask();
 
+    bool canAbort() const override;
+    bool abort() override;
+
    protected:
     void executeTask();
 
diff --git a/launcher/minecraft/MinecraftLoadAndCheck.cpp b/launcher/minecraft/MinecraftLoadAndCheck.cpp
index 149e7cf19..d456096d3 100644
--- a/launcher/minecraft/MinecraftLoadAndCheck.cpp
+++ b/launcher/minecraft/MinecraftLoadAndCheck.cpp
@@ -38,9 +38,7 @@ bool MinecraftLoadAndCheck::canAbort() const
 bool MinecraftLoadAndCheck::abort()
 {
     if (m_task && m_task->canAbort()) {
-        auto status = m_task->abort();
-        emitFailed("Aborted.");
-        return status;
+        return m_task->abort();
     }
     return Task::abort();
 }