diff --git a/launcher/launch/TaskStepWrapper.cpp b/launcher/launch/TaskStepWrapper.cpp
index 136057620..db9e8fad2 100644
--- a/launcher/launch/TaskStepWrapper.cpp
+++ b/launcher/launch/TaskStepWrapper.cpp
@@ -59,7 +59,9 @@ bool TaskStepWrapper::canAbort() const
 bool TaskStepWrapper::abort()
 {
     if (m_task && m_task->canAbort()) {
-        return m_task->abort();
+        auto status = m_task->abort();
+        emitFailed("Aborted.");
+        return status;
     }
     return Task::abort();
 }
diff --git a/launcher/minecraft/MinecraftLoadAndCheck.cpp b/launcher/minecraft/MinecraftLoadAndCheck.cpp
index 655894d2a..a9dcdf067 100644
--- a/launcher/minecraft/MinecraftLoadAndCheck.cpp
+++ b/launcher/minecraft/MinecraftLoadAndCheck.cpp
@@ -37,7 +37,9 @@ bool MinecraftLoadAndCheck::canAbort() const
 bool MinecraftLoadAndCheck::abort()
 {
     if (m_task && m_task->canAbort()) {
-        return m_task->abort();
+        auto status = m_task->abort();
+        emitFailed("Aborted.");
+        return status;
     }
     return Task::abort();
 }
\ No newline at end of file
diff --git a/launcher/minecraft/launch/AutoInstallJava.cpp b/launcher/minecraft/launch/AutoInstallJava.cpp
index 3f58a28a6..5daf89382 100644
--- a/launcher/minecraft/launch/AutoInstallJava.cpp
+++ b/launcher/minecraft/launch/AutoInstallJava.cpp
@@ -180,10 +180,7 @@ void AutoInstallJava::downloadJava(Meta::Version::Ptr version, QString javaName)
                 deletePath();
                 emitFailed(reason);
             });
-            connect(this, &Task::aborted, this, [this, deletePath] {
-                m_current_task->abort();
-                deletePath();
-            });
+            connect(m_current_task.get(), &Task::aborted, this, [deletePath] { deletePath(); });
             connect(m_current_task.get(), &Task::succeeded, this, &AutoInstallJava::setJavaPathFromPartial);
             connect(m_current_task.get(), &Task::failed, this, &AutoInstallJava::tryNextMajorJava);
             connect(m_current_task.get(), &Task::progress, this, &AutoInstallJava::setProgress);
@@ -236,7 +233,10 @@ void AutoInstallJava::tryNextMajorJava()
 }
 bool AutoInstallJava::abort()
 {
-    if (m_current_task && m_current_task->canAbort())
-        return m_current_task->abort();
-    return true;
+    if (m_current_task && m_current_task->canAbort()) {
+        auto status = m_current_task->abort();
+        emitFailed("Aborted.");
+        return status;
+    }
+    return Task::abort();
 }