diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index d21ae1c13f..53fec504fa 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -219,6 +219,9 @@ class InvoiceController extends BaseController
             $clients = $clients->where('clients.user_id', '=', Auth::user()->id);
         }
 
+        if($clientPublicId != 0)
+            $clients->where('public_id', $clientPublicId);
+
         $data = [
             'clients' => $clients->get(),
             'entityType' => $invoice->getEntityType(),