diff --git a/packages/core/src/helpers/downloadTorrent.js b/packages/core/src/helpers/downloadTorrent.js
index 38d6ce5..abaa958 100644
--- a/packages/core/src/helpers/downloadTorrent.js
+++ b/packages/core/src/helpers/downloadTorrent.js
@@ -47,18 +47,17 @@ export default async function downloadTorrent(
         },
     )
 
+    async function stopDownload() {
+        await client.call("remove", downloadId)
+        clearInterval(progressInterval)
+    }
+
     await new Promise(async (resolve, reject) => {
         if (typeof onStart === "function") {
             onStart()
         }
 
-        async function stopDownload() {
-            await client.call("remove", downloadId)
-            clearInterval(progressInterval)
-        }
-
         if (taskId) {
-            // TODO: Unregister me when download finish
             global._relic_eventBus.once(`task:cancel:${taskId}`, stopDownload)
         }
 
@@ -137,6 +136,5 @@ export default async function downloadTorrent(
         global._relic_eventBus.off(`task:cancel:${taskId}`, stopDownload)
     }
 
-
     return downloadId
 }
\ No newline at end of file