diff --git a/app/Http/Controllers/TaskApiController.php b/app/Http/Controllers/TaskApiController.php
index 5ded99e382dc..0671217dbc4b 100644
--- a/app/Http/Controllers/TaskApiController.php
+++ b/app/Http/Controllers/TaskApiController.php
@@ -41,6 +41,7 @@ class TaskApiController extends BaseAPIController
     {
         $tasks = Task::scope()
                         ->withTrashed()
+                        ->with('client', 'invoice')
                         ->orderBy('created_at', 'desc');
 
         return $this->listResponse($tasks);
diff --git a/app/Ninja/Transformers/TaskTransformer.php b/app/Ninja/Transformers/TaskTransformer.php
index a5a4538e906f..9615dd3550d9 100644
--- a/app/Ninja/Transformers/TaskTransformer.php
+++ b/app/Ninja/Transformers/TaskTransformer.php
@@ -38,22 +38,17 @@ class TaskTransformer extends EntityTransformer
 
     public function transform(Task $task)
     {
-        if($task->invoice)
-            $invoiceId = $task->invoice->public_id;
-        else
-            $invoiceId = null;
-        
         return array_merge($this->getDefaults($task), [
             'id' => (int) $task->public_id,
             'description' => $task->description,
             'duration' => $task->getDuration(),
             'updated_at' => (int) $this->getTimestamp($task->updated_at),
             'archived_at' => (int) $this->getTimestamp($task->deleted_at),
-            'invoice_id' => $invoiceId,
-            'client_id' => (int) $task->client->public_id,
+            'invoice_id' => $task->invoice ? (int) $task->invoice->public_id : false,
+            'client_id' => $task->client ? (int) $task->client->public_id : false,
             'is_deleted' => (bool) $task->is_deleted,
             'time_log' => $task->time_log,
             'is_running' => (bool) $task->is_running,
         ]);
     }
-}
\ No newline at end of file
+}