diff --git a/app/Http/Requests/TaskScheduler/ShowSchedulerRequest.php b/app/Http/Requests/TaskScheduler/ShowSchedulerRequest.php
index a0b4777df8f2..fddd848e154f 100644
--- a/app/Http/Requests/TaskScheduler/ShowSchedulerRequest.php
+++ b/app/Http/Requests/TaskScheduler/ShowSchedulerRequest.php
@@ -22,6 +22,6 @@ class ShowSchedulerRequest extends Request
      */
     public function authorize() : bool
     {
-        return auth()->user()->can('view', $this->scheduler);
+        return auth()->user()->can('view', $this->task_scheduler);
     }
 }
diff --git a/app/Http/Requests/TaskScheduler/UpdateSchedulerRequest.php b/app/Http/Requests/TaskScheduler/UpdateSchedulerRequest.php
index a573177b7b5a..dc537d1a37ab 100644
--- a/app/Http/Requests/TaskScheduler/UpdateSchedulerRequest.php
+++ b/app/Http/Requests/TaskScheduler/UpdateSchedulerRequest.php
@@ -23,7 +23,7 @@ class UpdateSchedulerRequest extends Request
      */
     public function authorize(): bool
     {
-        return auth()->user()->isAdmin();
+        return auth()->user()->isAdmin() && $this->task_scheduler->company_id == auth()->user()->company()->id;
     }
 
     public function rules(): array
diff --git a/tests/Feature/Scheduler/SchedulerTest.php b/tests/Feature/Scheduler/SchedulerTest.php
index 055206f4c027..28101cebefcb 100644
--- a/tests/Feature/Scheduler/SchedulerTest.php
+++ b/tests/Feature/Scheduler/SchedulerTest.php
@@ -54,6 +54,22 @@ class SchedulerTest extends TestCase
         );
     }
 
+
+
+    public function testSchedulerGet2()
+    {
+        
+        $scheduler = SchedulerFactory::create($this->company->id, $this->user->id);
+
+        $response = $this->withHeaders([
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/task_schedulers/'.$this->encodePrimaryKey($scheduler->id));
+
+        $response->assertStatus(200);
+    }
+
+
     public function testCustomDateRanges()
     {
         $data = [
@@ -619,21 +635,6 @@ class SchedulerTest extends TestCase
     }
 
 
-    // public function testSchedulerPut()
-    // {
-    //     $data = [
-    //         'description' => $this->faker->firstName(),
-    //     ];
-
-    //     $response = $this->withHeaders([
-    //         'X-API-SECRET' => config('ninja.api_secret'),
-    //         'X-API-TOKEN' => $this->token,
-    //     ])->put('/api/v1/task_schedulers/'.$this->encodePrimaryKey($this->task->id), $data);
-
-    //     $response->assertStatus(200);
-    // }
-
-
 
     // public function testSchedulerCantBeCreatedWithWrongData()
     // {