diff --git a/app/Http/Controllers/TaskController.php b/app/Http/Controllers/TaskController.php
index 2ca566196da6..e3fbe38ae2ed 100644
--- a/app/Http/Controllers/TaskController.php
+++ b/app/Http/Controllers/TaskController.php
@@ -148,9 +148,12 @@ class TaskController extends BaseController
     public function edit(TaskRequest $request)
     {
         $this->checkTimezone();
-
         $task = $request->entity();
 
+        if (! $task) {
+            return redirect('/');
+        }
+
         $actions = [];
         if ($task->invoice) {
             $actions[] = ['url' => URL::to("invoices/{$task->invoice->public_id}/edit"), 'label' => trans('texts.view_invoice')];