diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8de4966158..2940691c9b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 13.0.1 2018-05-17
+* Fixes bug in `STPRedirectContext` that'd close the `SFSafariViewController` during the initial redirects, but only in livemode. [#937](https://github.com/stripe/stripe-ios/pull/937)
+
 ## 13.0.0 2018-04-26
 * Removes Bitcoin source support. See MIGRATING.md. [#931](https://github.com/stripe/stripe-ios/pull/931)
 * Adds Masterpass support to `STPSourceParams` [#928](https://github.com/stripe/stripe-ios/pull/928)
diff --git a/Example/Custom Integration (ObjC)/SofortExampleViewController.m b/Example/Custom Integration (ObjC)/SofortExampleViewController.m
index 24d1eb5d1cb..7578ab53615 100644
--- a/Example/Custom Integration (ObjC)/SofortExampleViewController.m	
+++ b/Example/Custom Integration (ObjC)/SofortExampleViewController.m	
@@ -100,31 +100,35 @@ - (void)pay {
             // your app delegate to forward URLs to the Stripe SDK.
             // See `[Stripe handleStripeURLCallback:]`
             self.redirectContext = [[STPRedirectContext alloc] initWithSource:source completion:^(NSString *sourceID, NSString *clientSecret, NSError *error) {
-                [[STPAPIClient sharedClient] startPollingSourceWithId:sourceID
-                                                         clientSecret:clientSecret
-                                                              timeout:10
-                                                           completion:^(STPSource *source, NSError *error) {
-                                                               [self updateUIForPaymentInProgress:NO];
-                                                               if (error) {
-                                                                   [self.delegate exampleViewController:self didFinishWithError:error];
-                                                               } else {
-                                                                   switch (source.status) {
-                                                                       case STPSourceStatusChargeable:
-                                                                       case STPSourceStatusConsumed:
-                                                                           [self.delegate exampleViewController:self didFinishWithMessage:@"Payment successfully created"];
-                                                                           break;
-                                                                       case STPSourceStatusCanceled:
-                                                                           [self.delegate exampleViewController:self didFinishWithMessage:@"Payment failed"];
-                                                                           break;
-                                                                       case STPSourceStatusPending:
-                                                                       case STPSourceStatusFailed:
-                                                                       case STPSourceStatusUnknown:
-                                                                           [self.delegate exampleViewController:self didFinishWithMessage:@"Order received"];
-                                                                           break;
+                if (error) {
+                    [self.delegate exampleViewController:self didFinishWithError:error];
+                } else {
+                    [[STPAPIClient sharedClient] startPollingSourceWithId:sourceID
+                                                             clientSecret:clientSecret
+                                                                  timeout:10
+                                                               completion:^(STPSource *source, NSError *error) {
+                                                                   [self updateUIForPaymentInProgress:NO];
+                                                                   if (error) {
+                                                                       [self.delegate exampleViewController:self didFinishWithError:error];
+                                                                   } else {
+                                                                       switch (source.status) {
+                                                                           case STPSourceStatusChargeable:
+                                                                           case STPSourceStatusConsumed:
+                                                                               [self.delegate exampleViewController:self didFinishWithMessage:@"Payment successfully created"];
+                                                                               break;
+                                                                           case STPSourceStatusCanceled:
+                                                                               [self.delegate exampleViewController:self didFinishWithMessage:@"Payment failed"];
+                                                                               break;
+                                                                           case STPSourceStatusPending:
+                                                                           case STPSourceStatusFailed:
+                                                                           case STPSourceStatusUnknown:
+                                                                               [self.delegate exampleViewController:self didFinishWithMessage:@"Order received"];
+                                                                               break;
+                                                                       }
                                                                    }
-                                                               }
-                                                               self.redirectContext = nil;
-                                                           }];
+                                                                   self.redirectContext = nil;
+                                                               }];
+                }
             }];
             [self.redirectContext startRedirectFlowFromViewController:self];
         }
diff --git a/Example/Custom Integration (ObjC)/ThreeDSExampleViewController.m b/Example/Custom Integration (ObjC)/ThreeDSExampleViewController.m
index 605ab6caca5..3fc44e6603d 100644
--- a/Example/Custom Integration (ObjC)/ThreeDSExampleViewController.m	
+++ b/Example/Custom Integration (ObjC)/ThreeDSExampleViewController.m	
@@ -129,31 +129,35 @@ - (void)pay {
                     // your app delegate to forwards URLs to the Stripe SDK.
                     // See `[Stripe handleStripeURLCallback:]`
                     self.redirectContext = [[STPRedirectContext alloc] initWithSource:source completion:^(NSString *sourceID, NSString *clientSecret, NSError *error) {
-                        [[STPAPIClient sharedClient] startPollingSourceWithId:sourceID
-                                                                 clientSecret:clientSecret
-                                                                      timeout:10
-                                                                   completion:^(STPSource *source, NSError *error) {
-                                                                       [self updateUIForPaymentInProgress:NO];
-                                                                       if (error) {
-                                                                           [self.delegate exampleViewController:self didFinishWithError:error];
-                                                                       } else {
-                                                                           switch (source.status) {
-                                                                               case STPSourceStatusChargeable:
-                                                                               case STPSourceStatusConsumed:
-                                                                                   [self.delegate exampleViewController:self didFinishWithMessage:@"Payment successfully created"];
-                                                                                   break;
-                                                                               case STPSourceStatusCanceled:
-                                                                                   [self.delegate exampleViewController:self didFinishWithMessage:@"Payment failed"];
-                                                                                   break;
-                                                                               case STPSourceStatusPending:
-                                                                               case STPSourceStatusFailed:
-                                                                               case STPSourceStatusUnknown:
-                                                                                   [self.delegate exampleViewController:self didFinishWithMessage:@"Order received"];
-                                                                                   break;
+                        if (error) {
+                            [self.delegate exampleViewController:self didFinishWithError:error];
+                        } else {
+                            [[STPAPIClient sharedClient] startPollingSourceWithId:sourceID
+                                                                     clientSecret:clientSecret
+                                                                          timeout:10
+                                                                       completion:^(STPSource *source, NSError *error) {
+                                                                           [self updateUIForPaymentInProgress:NO];
+                                                                           if (error) {
+                                                                               [self.delegate exampleViewController:self didFinishWithError:error];
+                                                                           } else {
+                                                                               switch (source.status) {
+                                                                                   case STPSourceStatusChargeable:
+                                                                                   case STPSourceStatusConsumed:
+                                                                                       [self.delegate exampleViewController:self didFinishWithMessage:@"Payment successfully created"];
+                                                                                       break;
+                                                                                   case STPSourceStatusCanceled:
+                                                                                       [self.delegate exampleViewController:self didFinishWithMessage:@"Payment failed"];
+                                                                                       break;
+                                                                                   case STPSourceStatusPending:
+                                                                                   case STPSourceStatusFailed:
+                                                                                   case STPSourceStatusUnknown:
+                                                                                       [self.delegate exampleViewController:self didFinishWithMessage:@"Order received"];
+                                                                                       break;
+                                                                               }
                                                                            }
-                                                                       }
-                                                                       self.redirectContext = nil;
-                                                                   }];
+                                                                           self.redirectContext = nil;
+                                                                       }];
+                        }
                     }];
                     [self.redirectContext startRedirectFlowFromViewController:self];
                 }
diff --git a/Stripe/STPRedirectContext.m b/Stripe/STPRedirectContext.m
index 5146802dd54..77641af18d7 100644
--- a/Stripe/STPRedirectContext.m
+++ b/Stripe/STPRedirectContext.m
@@ -25,6 +25,8 @@ @interface STPRedirectContext () <SFSafariViewControllerDelegate, STPURLCallback
 @property (nonatomic, strong) STPSource *source;
 @property (nonatomic, strong, nullable) SFSafariViewController *safariVC;
 @property (nonatomic, assign, readwrite) STPRedirectContextState state;
+/// If we're on iOS 11+ and in the SafariVC flow, this tracks the latest URL loaded/redirected to during the initial load
+@property (nonatomic, strong, readwrite, nullable) NSURL *lastKnownSafariVCUrl;
 
 @property (nonatomic, assign) BOOL subscribedToURLNotifications;
 @property (nonatomic, assign) BOOL subscribedToForegroundNotifications;
@@ -121,7 +123,8 @@ - (void)startSafariViewControllerRedirectFlowFromViewController:(UIViewControlle
     if (self.state == STPRedirectContextStateNotStarted) {
         _state = STPRedirectContextStateInProgress;
         [self subscribeToUrlNotifications];
-        self.safariVC = [[SFSafariViewController alloc] initWithURL:self.source.redirect.url];
+        self.lastKnownSafariVCUrl = self.source.redirect.url;
+        self.safariVC = [[SFSafariViewController alloc] initWithURL:self.lastKnownSafariVCUrl];
         self.safariVC.delegate = self;
         [presentingViewController presentViewController:self.safariVC
                                                animated:YES
@@ -154,14 +157,39 @@ - (void)safariViewControllerDidFinish:(__unused SFSafariViewController *)control
 }
 
 - (void)safariViewController:(__unused SFSafariViewController *)controller didCompleteInitialLoad:(BOOL)didLoadSuccessfully {
+    /*
+     SafariVC is, imo, over-eager to report errors. The way that (for example) girogate.de redirects
+     can cause SafariVC to report that the initial load failed, even though it completes successfully.
+
+     So, only report failures to complete the initial load if the host was a Stripe domain.
+     Stripe uses 302 redirects, and this should catch local connection problems as well as
+     server-side failures from Stripe.
+     */
     if (didLoadSuccessfully == NO) {
-        stpDispatchToMainThreadIfNecessary(^{
-            [self handleRedirectCompletionWithError:[NSError stp_genericConnectionError]
-                        shouldDismissViewController:YES];
-        });
+        if (@available(iOS 11, *)) {
+            stpDispatchToMainThreadIfNecessary(^{
+                if ([self.lastKnownSafariVCUrl.host containsString:@"stripe.com"]) {
+                    [self handleRedirectCompletionWithError:[NSError stp_genericConnectionError]
+                                shouldDismissViewController:YES];
+                }
+            });
+        } else {
+            /*
+             We can only track the latest URL loaded on iOS 11, because `safariViewController:initialLoadDidRedirectToURL:`
+             didn't exist prior to that. This might be a spurious error, so we need to ignore it.
+             */
+        }
     }
 }
 
+- (void)safariViewController:(__unused SFSafariViewController *)controller initialLoadDidRedirectToURL:(NSURL *)URL {
+    stpDispatchToMainThreadIfNecessary(^{
+        // This is only kept up to date during the "initial load", but we only need the value in
+        // `safariViewController:didCompleteInitialLoad:`, so that's fine.
+        self.lastKnownSafariVCUrl = URL;
+    });
+}
+
 #pragma mark - Private methods -
 
 - (void)handleWillForegroundNotification {