diff --git a/src/services/TorrentManager/TorrentManager.ts b/src/services/TorrentManager/TorrentManager.ts
index b6ad9f3..5e4d267 100644
--- a/src/services/TorrentManager/TorrentManager.ts
+++ b/src/services/TorrentManager/TorrentManager.ts
@@ -147,16 +147,16 @@ export default class TorrentManager extends TorrentClientIpc
 	}
 
 	/**
-	 * Invoked when a torrent
+	 * Invoked when a torrent has finished downloading
 	 */
 	protected async onTorrentFinished(infoHash: string) {
 		let torrent = await MovieTorrent.findOne({
 			where: { infoHash }, relations: ["movieTicket"]
 		});
-		if (torrent !== undefined) {
-			let details = (await this.details(infoHash))[0];
-			this.app.service<Supervisor>("Supervisor").onMovieTorrentFinished(torrent, details);
+		if (torrent === undefined || torrent.movieTicket.isFulfilled || torrent.movieTicket.isCanceled) {
+			return;
 		}
-		// this.app.service<Supervisor>();
+		let details = (await this.details(infoHash))[0];
+		this.app.service<Supervisor>("Supervisor").onMovieTorrentFinished(torrent, details);
 	}
 }