diff --git a/src/Resources/config/admin_routing.yml b/src/Resources/config/admin_routing.yml
index 417d162ad..a71690ad6 100644
--- a/src/Resources/config/admin_routing.yml
+++ b/src/Resources/config/admin_routing.yml
@@ -59,8 +59,8 @@ sylius_refund_order_refund_payment_list:
         _sylius:
             template: "@SyliusRefundPlugin/Order/Admin/RefundPayment/list.html.twig"
             repository:
-                method: findByOrderNumber
-                arguments: $orderNumber
+                method: findByOrder
+                arguments: expr:service('sylius.repository.order').findOneByNumber($orderNumber)
 
 sylius_refund_complete_refund_payment:
     path: /orders/{orderNumber}/refund-payments/{id}/complete
diff --git a/src/Resources/views/Order/Admin/RefundPayment/list.html.twig b/src/Resources/views/Order/Admin/RefundPayment/list.html.twig
index cbec05e53..6c873a799 100644
--- a/src/Resources/views/Order/Admin/RefundPayment/list.html.twig
+++ b/src/Resources/views/Order/Admin/RefundPayment/list.html.twig
@@ -20,7 +20,7 @@
                     </td>
                     <td class="aligned collapsing">
                         {% if sm_can(refund_payment, 'complete', 'sylius_refund_refund_payment') %}
-                            <form action="{{ path('sylius_refund_complete_refund_payment', {'orderNumber': refund_payment.orderNumber, 'id': refund_payment.id}) }}" method="POST">
+                            <form action="{{ path('sylius_refund_complete_refund_payment', {'orderNumber': refund_payment.order.number, 'id': refund_payment.id}) }}" method="POST">
                                 <button class="ui icon labeled yellow loadable button"><i class="check icon"></i> {{ 'sylius.ui.complete'|trans }}</button>
                             </form>
                         {% endif %}