diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b90adcfd..4fc96249c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 * `[beta.2]` — Fixes password reset form throwing a MethodNotAllowed error when accessed.
 * `[beta.2]` — Fixes invalid password bug when attempting to change account email address.
 * `[beta.2]` — New attempt at fixing the issues when rendering files in the browser file editor on certain browsers.
+* `[beta.2]` — Fixes broken auto-deploy time checking causing no tokens to work.
 
 ### Changed
 * Deleting a server safely now continues even if the daemon reports a `HTTP/404` missing server error (requires `Daemon@0.4.0-beta.2.1`)
diff --git a/app/Http/Controllers/Remote/RemoteController.php b/app/Http/Controllers/Remote/RemoteController.php
index 78cd4d444..892a82842 100644
--- a/app/Http/Controllers/Remote/RemoteController.php
+++ b/app/Http/Controllers/Remote/RemoteController.php
@@ -129,7 +129,7 @@ class RemoteController extends Controller
         }
 
         // Check if token is expired
-        if ($model->created_at->lt(Carbon::now())) {
+        if ($model->created_at->addMinutes(5)->lt(Carbon::now())) {
             $model->delete();
 
             return response()->json(['error' => 'token_expired'], 403);