diff --git a/CHANGELOG.md b/CHANGELOG.md
index cfcd461..40f03d1 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.4] - 2021-08-05
+### Changed
+- Changed the default timeout for Real-Debrid communication to 10 seconds instead of 100 seconds.
+
 ## [1.8.3] - 2021-08-05
 ### Changed
 - Fixed potential issue with duplicates categories.
diff --git a/client/src/app/navbar/navbar.component.html b/client/src/app/navbar/navbar.component.html
index 60ce000..7231abc 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.3</div>
+          <div class="navbar-item">Version 1.8.4</div>
         </div>
       </div>
     </div>
diff --git a/package.json b/package.json
index df68e2b..754176e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rdt-client",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "description": "This is a web interface to manage your torrents on Real-Debrid.",
   "main": "index.js",
   "dependencies": {
diff --git a/server/RdtClient.Service/Services/Torrents.cs b/server/RdtClient.Service/Services/Torrents.cs
index 795184d..808ec20 100644
--- a/server/RdtClient.Service/Services/Torrents.cs
+++ b/server/RdtClient.Service/Services/Torrents.cs
@@ -42,7 +42,10 @@ namespace RdtClient.Service.Services
                 throw new Exception("Real-Debrid API Key not set in the settings");
             }
 
-            var rdtNetClient = new RdNetClient(null, _httpClientFactory.CreateClient());
+            var httpClient = _httpClientFactory.CreateClient();
+            httpClient.Timeout = TimeSpan.FromSeconds(10);
+
+            var rdtNetClient = new RdNetClient(null, httpClient);
             rdtNetClient.UseApiAuthentication(apiKey);
 
             return rdtNetClient;
diff --git a/server/RdtClient.Web/RdtClient.Web.csproj b/server/RdtClient.Web/RdtClient.Web.csproj
index 4f35e74..0888ced 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.3</Version>
+    <Version>1.8.4</Version>
   </PropertyGroup>
 
   <ItemGroup>