diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 85f870469e6..7eef41bab37 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -735,7 +735,7 @@ class WebsiteSale(http.Controller):
                 acquirer.button = acquirer_button
                 values['acquirers'].append(acquirer)
 
-                values['tokens'] = request.env['payment.token'].search([('partner_id', '=', order.partner_id.id), ('acquirer_id', 'in', acquirers.ids)])
+            values['tokens'] = request.env['payment.token'].search([('partner_id', '=', order.partner_id.id), ('acquirer_id', 'in', acquirers.ids)])
 
         return request.render("website_sale.payment", values)
 
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 0644fd08df7..34e6cd89f6c 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -1333,7 +1333,7 @@
                                     </label>
                                   </li>
                                 </t>
-                                <li t-if="[acq for acq in acquirers if acq.registration_view_template_id]">
+                                <li t-if="tokens">
                                     <label>
                                         <input type="radio" name="acquirer" />
                                         <span class='fa fa-2x fa-credit-card'/>