diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40f03d1..187ba92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.8.5] - 2021-10-07
+### Changed
+- Fixed issue where deleting a torrent could error out.
+
 ## [1.8.4] - 2021-08-05
 ### Changed
 - Changed the default timeout for Real-Debrid communication to 10 seconds instead of 100 seconds.
diff --git a/client/src/app/navbar/navbar.component.html b/client/src/app/navbar/navbar.component.html
index 7231abc..84b8164 100644
--- a/client/src/app/navbar/navbar.component.html
+++ b/client/src/app/navbar/navbar.component.html
@@ -55,7 +55,7 @@
           <a class="navbar-item"> Profile </a>
           <a class="navbar-item" (click)="logout()"> Logout </a>
           <hr class="navbar-divider" />
-          <div class="navbar-item">Version 1.8.4</div>
+          <div class="navbar-item">Version 1.8.5</div>
         </div>
       </div>
     </div>
diff --git a/package.json b/package.json
index 754176e..3eb75fe 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rdt-client",
-  "version": "1.8.4",
+  "version": "1.8.5",
   "description": "This is a web interface to manage your torrents on Real-Debrid.",
   "main": "index.js",
   "dependencies": {
diff --git a/server/RdtClient.Data/Data/TorrentData.cs b/server/RdtClient.Data/Data/TorrentData.cs
index 42aa5fb..043a95a 100644
--- a/server/RdtClient.Data/Data/TorrentData.cs
+++ b/server/RdtClient.Data/Data/TorrentData.cs
@@ -168,6 +168,11 @@ namespace RdtClient.Data.Data
         {
             var dbTorrent = await _dataContext.Torrents.FirstOrDefaultAsync(m => m.TorrentId == torrentId);
 
+            if (dbTorrent == null)
+            {
+                return;
+            }
+
             dbTorrent.Completed = datetime;
 
             await _dataContext.SaveChangesAsync();
@@ -179,6 +184,11 @@ namespace RdtClient.Data.Data
         {
             var dbTorrent = await _dataContext.Torrents.FirstOrDefaultAsync(m => m.TorrentId == torrentId);
 
+            if (dbTorrent == null)
+            {
+                return;
+            }
+
             dbTorrent.FilesSelected = datetime;
 
             await _dataContext.SaveChangesAsync();
diff --git a/server/RdtClient.Web/RdtClient.Web.csproj b/server/RdtClient.Web/RdtClient.Web.csproj
index 0888ced..53ffb89 100644
--- a/server/RdtClient.Web/RdtClient.Web.csproj
+++ b/server/RdtClient.Web/RdtClient.Web.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net5.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <UserSecretsId>94c24cba-f03f-4453-a671-3640b517c573</UserSecretsId>
-    <Version>1.8.4</Version>
+    <Version>1.8.5</Version>
   </PropertyGroup>
 
   <ItemGroup>