diff --git a/addons/account_payment/views/account_portal_templates.xml b/addons/account_payment/views/account_portal_templates.xml
index 86541440506..d209d68c586 100644
--- a/addons/account_payment/views/account_portal_templates.xml
+++ b/addons/account_payment/views/account_portal_templates.xml
@@ -35,8 +35,8 @@
                     <t t-call="payment.payment_tokens_list">
                         <t t-set="mode" t-value="'payment'"/>
                         <t t-set="partner_id" t-value="invoice.partner_id.id"/>
-                        <t t-set="success_url" t-value="'/my/invoices/%s' % invoice.id"/>
-                        <t t-set="error_url" t-value="'/my/invoices/%s' % invoice.id"/>
+                        <t t-set="success_url" t-value="'/my/invoices/%s?%s' % (invoice.id, keep_query())"/>
+                        <t t-set="error_url" t-value="'/my/invoices/%s?%s' % (invoice.id, keep_query())"/>
                         <t t-set="access_token" t-value="access_token or ''"/>
                         <t t-set="callback_method" t-value="''"/>
                         <t t-set="form_action" t-value="'/invoice/pay/' + str(invoice.id) + '/s2s_token_tx/'"/>
@@ -123,4 +123,4 @@
             </t>
         </xpath>
     </template>
-</odoo>
\ No newline at end of file
+</odoo>