diff --git a/src/pretix/plugins/stripe/views.py b/src/pretix/plugins/stripe/views.py
index 1b3dd9122a..8b20a01e19 100644
--- a/src/pretix/plugins/stripe/views.py
+++ b/src/pretix/plugins/stripe/views.py
@@ -429,6 +429,12 @@ class ReturnView(StripeOrderView, View):
                 finally:
                     if 'payment_stripe_token' in request.session:
                         del request.session['payment_stripe_token']
+            elif src.status == 'consumed' and (self.payment.info_data.get('id', '').startswith('py_') or
+                                               self.payment.info_data.get('id', '').startswith('ch_')):
+                # Webhook was faster, wow! ;)
+                if 'payment_stripe_token' in request.session:
+                    del request.session['payment_stripe_token']
+                return self._redirect_to_order()
             else:
                 self.payment.state = OrderPayment.PAYMENT_STATE_FAILED
                 self.payment.info = str(src)