diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 1e9d9d52f37..81a4743eb3f 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -780,16 +780,14 @@ class website_sale(http.Controller):
                 '|', ('sale_order_id', '=', order.id), ('reference', '=', order.name)
             ], context=context)
 
+        state = 'done'
+        message = ""
+        validation = None
+
         if not tx_ids:
             if order.amount_total:
-                return {
-                    'state': 'error',
-                    'message': '<p>%s</p>' % _('There seems to be an error with your request.'),
-                }
-            else:
-                state = 'done'
-                message = ""
-                validation = None
+                state = 'error'
+                message = '<p>%s</p>' % _('There seems to be an error with your request.')
         else:
             tx = request.registry['payment.transaction'].browse(cr, SUPERUSER_ID, tx_ids[0], context=context)
             state = tx.state