diff --git a/.env.ci b/.env.ci
index 102342d45334..a033ea644c05 100644
--- a/.env.ci
+++ b/.env.ci
@@ -2,7 +2,7 @@ APP_NAME="Invoice Ninja"
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
-APP_URL=http://172.17.0.1
+APP_URL=http://ninja.test
 MULTI_DB_ENABLED=false
 # database
 DB_CONNECTION=mysql
diff --git a/app/Filters/InvoiceFilters.php b/app/Filters/InvoiceFilters.php
index 254183ebf4e4..df0e557b4200 100644
--- a/app/Filters/InvoiceFilters.php
+++ b/app/Filters/InvoiceFilters.php
@@ -13,6 +13,7 @@ namespace App\Filters;
 
 use App\Models\Invoice;
 use App\Models\User;
+use App\Utils\Traits\MakesHash;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Carbon;
 
@@ -21,6 +22,7 @@ use Illuminate\Support\Carbon;
  */
 class InvoiceFilters extends QueryFilters
 {
+    use MakesHash;
     /**
      * Filter based on client status.
      *
@@ -65,6 +67,18 @@ class InvoiceFilters extends QueryFilters
         return $this->builder;
     }
 
+    public function client_id(string $client_id = '') :Builder
+    {
+        if (strlen($client_id) == 0) {
+            return $this->builder;
+        }
+
+        $this->builder->where('client_id', $this->decodePrimaryKey($client_id));
+
+        return $this->builder;
+        
+    }
+
     public function number(string $number) :Builder
     {
         return $this->builder->where('number', $number);
@@ -96,6 +110,7 @@ class InvoiceFilters extends QueryFilters
         });
     }
 
+
     /**
      * Filters the list based on the status
      * archived, active, deleted - legacy from V1.