diff --git a/launcher/launch/LaunchTask.cpp b/launcher/launch/LaunchTask.cpp
index 6aaf2af96..e6230b17c 100644
--- a/launcher/launch/LaunchTask.cpp
+++ b/launcher/launch/LaunchTask.cpp
@@ -76,6 +76,7 @@ void LaunchTask::executeTask()
     if (!m_steps.size()) {
         state = LaunchTask::Finished;
         emitSucceeded();
+        return;
     }
     state = LaunchTask::Running;
     onStepFinished();
diff --git a/launcher/launch/steps/LookupServerAddress.cpp b/launcher/launch/steps/LookupServerAddress.cpp
index 4b67b3092..fdd9fc545 100644
--- a/launcher/launch/steps/LookupServerAddress.cpp
+++ b/launcher/launch/steps/LookupServerAddress.cpp
@@ -87,6 +87,6 @@ void LookupServerAddress::resolve(const QString& address, quint16 port)
     m_output->address = address;
     m_output->port = port;
 
-    emitSucceeded();
     m_dnsLookup->deleteLater();
+    emitSucceeded();
 }
diff --git a/launcher/modplatform/helpers/HashUtils.cpp b/launcher/modplatform/helpers/HashUtils.cpp
index a3b8d904c..180402576 100644
--- a/launcher/modplatform/helpers/HashUtils.cpp
+++ b/launcher/modplatform/helpers/HashUtils.cpp
@@ -145,8 +145,8 @@ void Hasher::executeTask()
         } else if (m_result = m_future.result(); m_result.isEmpty()) {
             emitFailed("Empty hash!");
         } else {
-            emitSucceeded();
             emit resultsReady(m_result);
+            emitSucceeded();
         }
     });
     m_watcher.setFuture(m_future);