diff --git a/CHANGELOG.yml b/CHANGELOG.yml
index 7d19ee81961..5874d3a2656 100644
--- a/CHANGELOG.yml
+++ b/CHANGELOG.yml
@@ -5,7 +5,7 @@ upcoming:
   dev:
     - Adds new availability checks and enables new compiler warning for better checking of API availabilities - ash
   user_facing:
-    - 
+    - Fixes a problem entering credit cards for auction registration - ash
 
 releases:
   - version: 5.0.3
diff --git a/Podfile b/Podfile
index 5a497723f3f..7bea1f1883f 100644
--- a/Podfile
+++ b/Podfile
@@ -93,8 +93,8 @@ target 'Artsy' do
   # Emission's dependencies
   # use `cat ~/.cocoapods/repos/artsy/Emission/1.x.x/Emission.podspec.json` to see the Podspec
 
-  # For Stripe integration with Emission
-  pod 'tipsi-stripe', git: 'https://github.com/tipsi/tipsi-stripe.git', tag: '7.5.0'
+  # For Stripe integration with Emission. Using Ash's fork for this issue: https://github.com/tipsi/tipsi-stripe/issues/408
+  pod 'tipsi-stripe', git: 'https://github.com/ashfurrow/tipsi-stripe.git', branch: 'fix-infinite-loop'
   pod 'react-native-mapbox-gl', git: 'https://github.com/l2succes/react-native-mapbox-gl', branch: 'fix-gesture-recognizer'
   pod 'SentryReactNative', git: 'https://github.com/getsentry/react-native-sentry.git', tag: 'v0.30.3'
   pod 'Pulley', :git => 'https://github.com/l2succes/Pulley.git', :branch => 'master'
diff --git a/Podfile.lock b/Podfile.lock
index 6c0d70af650..53c5ef0091e 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -345,7 +345,7 @@ DEPENDENCIES:
   - Starscream
   - SwiftyJSON
   - Then
-  - tipsi-stripe (from `https://github.com/tipsi/tipsi-stripe.git`, tag `7.5.0`)
+  - tipsi-stripe (from `https://github.com/ashfurrow/tipsi-stripe.git`, branch `fix-infinite-loop`)
   - UICKeyChainStore
   - "UIView+BooleanAnimations"
   - VCRURLConnection
@@ -461,8 +461,8 @@ EXTERNAL SOURCES:
     :branch: add-axial-support
     :git: https://github.com/alloy/SSFadingScrollView.git
   tipsi-stripe:
-    :git: https://github.com/tipsi/tipsi-stripe.git
-    :tag: 7.5.0
+    :branch: fix-infinite-loop
+    :git: https://github.com/ashfurrow/tipsi-stripe.git
 
 CHECKOUT OPTIONS:
   AFOAuth1Client:
@@ -514,8 +514,8 @@ CHECKOUT OPTIONS:
     :commit: 3920e3582e46c9fe23b0d1200e28614ebd66d801
     :git: https://github.com/alloy/SSFadingScrollView.git
   tipsi-stripe:
-    :git: https://github.com/tipsi/tipsi-stripe.git
-    :tag: 7.5.0
+    :commit: bfebb733fb44d3e1d0522a38a317993f9c686422
+    :git: https://github.com/ashfurrow/tipsi-stripe.git
 
 SPEC CHECKSUMS:
   Adjust: b1f2b0e0b426fa991d69ed7fc9de806cf6dff5a6
@@ -596,6 +596,6 @@ SPEC CHECKSUMS:
   "XCTest+OHHTTPStubSuiteCleanUp": 4469ec8863c6bc022c5089a9b94233eb3416c5ee
   yoga: 4ce3811b3db5f47fe1e125f15383003316a616b8
 
-PODFILE CHECKSUM: 5805fc0d5fff729311b6d94f6f8ba491404980a5
+PODFILE CHECKSUM: c03452c052adadc827dda2ff280a76b98e0a10fc
 
 COCOAPODS: 1.6.0.beta.1