diff --git a/app/Http/ViewComposers/ClientPortalHeaderComposer.php b/app/Http/ViewComposers/ClientPortalHeaderComposer.php
index a7a799150d59..f74e4903801f 100644
--- a/app/Http/ViewComposers/ClientPortalHeaderComposer.php
+++ b/app/Http/ViewComposers/ClientPortalHeaderComposer.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\ViewComposers;
 
-use App\Models\Contact;
 use DB;
+use App\Models\Contact;
 use Illuminate\View\View;
 
 /**
@@ -37,6 +37,7 @@ class ClientPortalHeaderComposer
         }
 
         $client = $contact->client;
+        $account = $contact->account;
 
         $hasDocuments = DB::table('invoices')
                             ->where('invoices.client_id', '=', $client->id)
@@ -44,8 +45,18 @@ class ClientPortalHeaderComposer
                             ->join('documents', 'documents.invoice_id', '=', 'invoices.id')
                             ->count();
 
+        $hasPaymentMethods = false;
+        if ($account->getTokenGatewayId() && ! $account->enable_client_portal_dashboard) {
+            $hasPaymentMethods = DB::table('payment_methods')
+                                    ->where('contacts.client_id', '=', $client->id)
+                                    ->whereNull('payment_methods.deleted_at')
+                                    ->join('contacts', 'contacts.id', '=', 'payment_methods.contact_id')
+                                    ->count();
+        }
+
         $view->with('hasQuotes', $client->publicQuotes->count());
         $view->with('hasCredits', $client->creditsWithBalance->count());
         $view->with('hasDocuments', $hasDocuments);
+        $view->with('hasPaymentMethods', $hasPaymentMethods);
     }
 }
diff --git a/resources/views/public/header.blade.php b/resources/views/public/header.blade.php
index 93184576565b..e799a1f8dd8d 100644
--- a/resources/views/public/header.blade.php
+++ b/resources/views/public/header.blade.php
@@ -97,7 +97,7 @@
                             {!! link_to('/client/documents', trans('texts.documents') ) !!}
                         </li>
                     @endif
-                    @if (isset($account) && $account->getTokenGatewayId() && !$account->enable_client_portal_dashboard)
+                    @if (isset($hasPaymentMethods) && $hasPaymentMethods)
                         <li {!! Request::is('*client/payment_methods') ? 'class="active"' : '' !!}>
                             {!! link_to('/client/payment_methods', trans('texts.payment_methods') ) !!}
                         </li>