diff --git a/app/Http/Controllers/ReportTemplatesController.php b/app/Http/Controllers/ReportTemplatesController.php
index b5d13cf8fe..ff938b732d 100644
--- a/app/Http/Controllers/ReportTemplatesController.php
+++ b/app/Http/Controllers/ReportTemplatesController.php
@@ -4,7 +4,6 @@ namespace App\Http\Controllers;
 
 use App\Models\CustomField;
 use App\Models\ReportTemplate;
-use Illuminate\Contracts\View\View;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 
@@ -47,13 +46,20 @@ class ReportTemplatesController extends Controller
         ]);
     }
 
-    public function edit($reportId): View
+    public function edit($reportId)
     {
         $this->authorize('reports.view');
 
+        $reportTemplate = ReportTemplate::find($reportId);
+
+        if (!$reportTemplate) {
+            return redirect()->route('reports/custom')
+                ->with('error', trans('admin/reports/message.no_report_permission'));
+        }
+
         return view('reports/custom', [
             'customfields' => CustomField::get(),
-            'template' => ReportTemplate::findOrFail($reportId),
+            'template' => $reportTemplate,
         ]);
     }
 
diff --git a/tests/Feature/ReportTemplates/EditReportTemplateTest.php b/tests/Feature/ReportTemplates/EditReportTemplateTest.php
index 6016edfc19..46f91b74ff 100644
--- a/tests/Feature/ReportTemplates/EditReportTemplateTest.php
+++ b/tests/Feature/ReportTemplates/EditReportTemplateTest.php
@@ -18,8 +18,6 @@ class EditReportTemplateTest extends TestCase implements TestsPermissionsRequire
 
     public function testCannotLoadEditPageForAnotherUsersReportTemplate()
     {
-        $this->markTestIncomplete('Returns 404...');
-
         $user = User::factory()->canViewReports()->create();
         $reportTemplate = ReportTemplate::factory()->create();