diff --git a/app/Repositories/TaskStatusRepository.php b/app/Repositories/TaskStatusRepository.php
index 6448bac5c31b..6d083fb70804 100644
--- a/app/Repositories/TaskStatusRepository.php
+++ b/app/Repositories/TaskStatusRepository.php
@@ -12,6 +12,7 @@
 namespace App\Repositories;
 
 use App\Models\Task;
+use App\Models\TaskStatus;
 
 /**
  * Class for task status repository.
@@ -21,10 +22,14 @@ class TaskStatusRepository extends BaseRepository
 
 	public function delete($task_status)
 	{
+        $task_status = TaskStatus::where('company_id', $task_status->company_id)
+                                 ->first();
+
+        $new_status = $task_status ? $task_status->id : null;
 
         Task::where('status_id', $task_status->id)
         ->where('company_id', $task_status->company_id)
-        ->update(['status_id' => null]);
+        ->update(['status_id' => $new_status]);
 
 
         parent::delete($task_status);
@@ -36,9 +41,14 @@ class TaskStatusRepository extends BaseRepository
 	public function archive($task_status)
 	{
 
+        $task_status = TaskStatus::where('company_id', $task_status->company_id)
+                                 ->first();
+
+        $new_status = $task_status ? $task_status->id : null;
+        
         Task::where('status_id', $task_status->id)
         ->where('company_id', $task_status->company_id)
-        ->update(['status_id' => null]);
+        ->update(['status_id' => $new_status]);
 
 
         parent::archive($task_status);