diff --git a/addons/payment/controllers/portal.py b/addons/payment/controllers/portal.py
index afe2a089bc4..2fc980147f1 100644
--- a/addons/payment/controllers/portal.py
+++ b/addons/payment/controllers/portal.py
@@ -222,7 +222,14 @@ class WebsitePayment(http.Controller):
         # s2s mode will always generate a token, which we don't want for public users
         valid_flows = ['form', 's2s'] if not user._is_public() else ['form']
         values['acquirers'] = [acq for acq in acquirers if acq.payment_flow in valid_flows]
-        values['pms'] = request.env['payment.token'].search([('acquirer_id', 'in', acquirers.ids)])
+        if partner_id:
+            values['pms'] = request.env['payment.token'].search([
+                ('acquirer_id', 'in', acquirers.ids),
+                ('partner_id', '=', partner_id)
+            ])
+        else:
+            values['pms'] = []
+
 
         return request.render('payment.pay', values)