diff --git a/app/Http/Controllers/InvoiceApiController.php b/app/Http/Controllers/InvoiceApiController.php
index 1173208799f8..5dd210f92ab3 100644
--- a/app/Http/Controllers/InvoiceApiController.php
+++ b/app/Http/Controllers/InvoiceApiController.php
@@ -181,7 +181,11 @@ class InvoiceApiController extends BaseAPIController
                 $client = $this->clientRepo->save($clientData);
             }
         } elseif (isset($data['client_id'])) {
-            $client = Client::scope($data['client_id'])->firstOrFail();
+            $client = Client::scope($data['client_id'])->first();
+
+            if (! $client) {
+                return $this->errorResponse('Client not found', 404);
+            }
         }
 
         $data = self::prepareData($data, $client);