diff --git a/app/Http/Livewire/CreditsTable.php b/app/Http/Livewire/CreditsTable.php
index 6f51d16e53..a2b2205aa0 100644
--- a/app/Http/Livewire/CreditsTable.php
+++ b/app/Http/Livewire/CreditsTable.php
@@ -17,7 +17,7 @@ class CreditsTable extends Component
     public function render()
     {
         $query = Credit::query()
-            ->where('company_id', auth('contact')->user()->company->id)
+            ->where('client_id', auth('contact')->user()->client->id)
             ->orderBy($this->sort_field, $this->sort_asc ? 'asc' : 'desc')
             ->paginate($this->per_page);
 
diff --git a/app/Http/Livewire/PaymentMethodsTable.php b/app/Http/Livewire/PaymentMethodsTable.php
index a8fca8c73a..8b0c798ac2 100644
--- a/app/Http/Livewire/PaymentMethodsTable.php
+++ b/app/Http/Livewire/PaymentMethodsTable.php
@@ -24,7 +24,6 @@ class PaymentMethodsTable extends Component
     {
         $query = ClientGatewayToken::query()
             ->with('gateway_type')
-            ->where('company_id', auth('contact')->user()->company->id)
             ->where('client_id', $this->client->id)
             ->orderBy($this->sort_field, $this->sort_asc ? 'asc' : 'desc')
             ->paginate($this->per_page);
diff --git a/app/Http/Livewire/PaymentsTable.php b/app/Http/Livewire/PaymentsTable.php
index 0b2b3b81e7..a726128502 100644
--- a/app/Http/Livewire/PaymentsTable.php
+++ b/app/Http/Livewire/PaymentsTable.php
@@ -24,7 +24,7 @@ class PaymentsTable extends Component
     {
         $query = Payment::query()
             ->with('type', 'client')
-            ->where('company_id', auth('contact')->user()->company->id)
+            ->where('client_id', auth('contact')->user()->client->id)
             ->orderBy($this->sort_field, $this->sort_asc ? 'asc' : 'desc')
             ->paginate($this->per_page);
 
diff --git a/app/Http/Livewire/QuotesTable.php b/app/Http/Livewire/QuotesTable.php
index d27c59bd74..9bf687da37 100644
--- a/app/Http/Livewire/QuotesTable.php
+++ b/app/Http/Livewire/QuotesTable.php
@@ -46,7 +46,7 @@ class QuotesTable extends Component
         }
 
         $query = $query
-            ->where('company_id', auth('contact')->user()->company->id)
+            ->where('client_id', auth('contact')->user()->client->id)
             ->paginate($this->per_page);
 
         return render('components.livewire.quotes-table', [
diff --git a/app/Http/Livewire/RecurringInvoicesTable.php b/app/Http/Livewire/RecurringInvoicesTable.php
index d4e4e3dceb..68f83c4f6a 100644
--- a/app/Http/Livewire/RecurringInvoicesTable.php
+++ b/app/Http/Livewire/RecurringInvoicesTable.php
@@ -18,7 +18,7 @@ class RecurringInvoicesTable extends Component
         $query = RecurringInvoice::query();
 
         $query = $query
-            ->where('company_id', auth('contact')->user()->company->id)
+            ->where('client_id', auth('contact')->user()->client->id)
             ->whereIn('status_id', [RecurringInvoice::STATUS_PENDING, RecurringInvoice::STATUS_ACTIVE, RecurringInvoice::STATUS_COMPLETED])
             ->orderBy('status_id', 'asc')
             ->with('client')