diff --git a/server/RdtClient.Service/Services/TorrentRunner.cs b/server/RdtClient.Service/Services/TorrentRunner.cs
index 07b901b..d4e4d2b 100644
--- a/server/RdtClient.Service/Services/TorrentRunner.cs
+++ b/server/RdtClient.Service/Services/TorrentRunner.cs
@@ -237,7 +237,7 @@ namespace RdtClient.Service.Services
                 // Check if torrent is complete
                 if (torrent.Downloads.Count > 0)
                 {
-                    var allComplete = torrent.Downloads.All(m => m.UnpackingFinished != null);
+                    var allComplete = torrent.Downloads.All(m => m.Completed != null);
 
                     if (allComplete)
                     {
diff --git a/server/RdtClient.Service/Services/Torrents.cs b/server/RdtClient.Service/Services/Torrents.cs
index 30eff12..ca9c4e2 100644
--- a/server/RdtClient.Service/Services/Torrents.cs
+++ b/server/RdtClient.Service/Services/Torrents.cs
@@ -228,7 +228,7 @@ namespace RdtClient.Service.Services
             var downloadPath = await DownloadPath(download.Torrent);
             
             download.DownloadFinished = null;
-            await _downloads.UpdateDownloadStarted(download.DownloadId, null);
+            await _downloads.UpdateDownloadFinished(download.DownloadId, null);
 
             download.Completed = null;
             await _downloads.UpdateCompleted(download.DownloadId, null);