diff --git a/app/commands/donations/payment_intent/create.rb b/app/commands/donations/payment_intent/create.rb
index 67f6876cbe..d0e569763c 100644
--- a/app/commands/donations/payment_intent/create.rb
+++ b/app/commands/donations/payment_intent/create.rb
@@ -1,4 +1,7 @@
 module Donations
+  class PaymentIntentError < RuntimeError
+  end
+
   module PaymentIntent
     class Create
       include Mandate
diff --git a/app/controllers/api/donations/payment_intents_controller.rb b/app/controllers/api/donations/payment_intents_controller.rb
index 4b25b9ffab..b1118a789e 100644
--- a/app/controllers/api/donations/payment_intents_controller.rb
+++ b/app/controllers/api/donations/payment_intents_controller.rb
@@ -14,6 +14,12 @@ def create
             client_secret: payment_intent.client_secret
           }
         }
+      rescue Stripe::InvalidRequestError => e
+        # React currently can't handle this being
+        # anything other than a 200
+        render json: {
+          error: e.message
+        }, status: :ok
       end
 
       def succeeded
diff --git a/app/javascript/components/donations/Form.tsx b/app/javascript/components/donations/Form.tsx
index d3dbbc8528..6445aec119 100644
--- a/app/javascript/components/donations/Form.tsx
+++ b/app/javascript/components/donations/Form.tsx
@@ -1,8 +1,10 @@
-import React, { useState, createContext } from 'react'
+import React, { useState, createContext, useCallback, useMemo } from 'react'
 import { PaymentIntentType } from './StripeForm'
 import { Tab, TabContext } from '../common/Tab'
 import { TransactionForm } from './TransactionForm'
 import { ExistingSubscriptionNotice } from './ExistingSubscriptionNotice'
+import { ExercismStripeElements } from './donation-form/ExercismStripeElements'
+import { StripeForm } from './StripeForm'
 
 const TabsContext = createContext<TabContext>({
   current: 'subscription',
@@ -13,6 +15,9 @@ type Links = {
   settings: string
 }
 
+const PAYMENT_DEFAULT_AMOUNT_IN_DOLLARS = 32
+const SUBSCRIPTION_DEFAULT_AMOUNT_IN_DOLLARS = 32
+
 export const Form = ({
   existingSubscriptionAmountinDollars,
   onSuccess,
@@ -22,10 +27,49 @@ export const Form = ({
   onSuccess: (type: PaymentIntentType, amountInDollars: number) => void
   links: Links
 }): JSX.Element => {
+  const [amountInDollars, setAmountInDollars] = useState({
+    subscription: SUBSCRIPTION_DEFAULT_AMOUNT_IN_DOLLARS,
+    payment: PAYMENT_DEFAULT_AMOUNT_IN_DOLLARS,
+  })
   const [transactionType, setTransactionType] = useState<PaymentIntentType>(
     existingSubscriptionAmountinDollars ? 'payment' : 'subscription'
   )
 
+  const handleAmountChange = useCallback(
+    (transactionType: PaymentIntentType) => {
+      return (value: number) => {
+        switch (transactionType) {
+          case 'subscription':
+            setAmountInDollars({
+              ...amountInDollars,
+              subscription: isNaN(value)
+                ? SUBSCRIPTION_DEFAULT_AMOUNT_IN_DOLLARS
+                : value,
+            })
+
+            break
+          case 'payment':
+            setAmountInDollars({
+              ...amountInDollars,
+              payment: isNaN(value) ? PAYMENT_DEFAULT_AMOUNT_IN_DOLLARS : value,
+            })
+
+            break
+        }
+      }
+    },
+    [amountInDollars]
+  )
+
+  const currentAmountInDollars = useMemo(() => {
+    switch (transactionType) {
+      case 'payment':
+        return amountInDollars.payment
+      case 'subscription':
+        return amountInDollars.subscription
+    }
+  }, [amountInDollars, transactionType])
+
   return (
     <TabsContext.Provider
       value={{
@@ -45,10 +89,9 @@ export const Form = ({
         <div className="--content">
           <Tab.Panel id="subscription" context={TabsContext}>
             <TransactionForm
-              transactionType="subscription"
-              defaultAmountInDollars={32}
+              amountInDollars={amountInDollars.subscription}
+              onAmountChange={handleAmountChange('subscription')}
               presetAmountsInDollars={[16, 32, 64, 128]}
-              onSuccess={onSuccess}
             >
               {existingSubscriptionAmountinDollars != null ? (
                 <ExistingSubscriptionNotice
@@ -61,12 +104,18 @@ export const Form = ({
           </Tab.Panel>
           <Tab.Panel id="payment" context={TabsContext}>
             <TransactionForm
-              transactionType="payment"
-              defaultAmountInDollars={32}
+              amountInDollars={amountInDollars.payment}
+              onAmountChange={handleAmountChange('payment')}
               presetAmountsInDollars={[32, 128, 256, 512]}
-              onSuccess={onSuccess}
             />
           </Tab.Panel>
+          <ExercismStripeElements>
+            <StripeForm
+              paymentIntentType={transactionType}
+              amountInDollars={currentAmountInDollars}
+              onSuccess={onSuccess}
+            />
+          </ExercismStripeElements>
         </div>
       </div>
     </TabsContext.Provider>
diff --git a/app/javascript/components/donations/StripeForm.tsx b/app/javascript/components/donations/StripeForm.tsx
index 972730a834..e8952a21d4 100644
--- a/app/javascript/components/donations/StripeForm.tsx
+++ b/app/javascript/components/donations/StripeForm.tsx
@@ -102,7 +102,13 @@ export function StripeForm({
         type: paymentIntentType,
         amount_in_dollars: amountInDollars,
       }),
-    }).then((data: any) => data.paymentIntent)
+    }).then((data: any) => {
+      if (data.error) {
+        setError(`Payment failed with error: ${data.error}`)
+        return null
+      }
+      return data.paymentIntent
+    })
   }, [paymentIntentType, amountInDollars])
 
   const handleSubmit = async (event: React.ChangeEvent<HTMLFormElement>) => {
@@ -118,6 +124,12 @@ export function StripeForm({
     setProcessing(true)
 
     getPaymentRequest().then(async (paymentIntent: PaymentIntent) => {
+      // If we've failed to get a payment intent get out of here
+      if (paymentIntent === undefined || paymentIntent === null) {
+        setProcessing(false)
+        return
+      }
+
       // Get a reference to a mounted CardElement. Elements knows how
       // to find the CardElement because there can only ever be one of
       // each type of element. We could maybe use a ref here instead?
@@ -156,7 +168,7 @@ export function StripeForm({
           <button
             className="btn-primary btn-s"
             type="submit"
-            disabled={processing || !cardValid || succeeded}
+            /*disabled={processing || !cardValid || succeeded}*/
           >
             {processing ? <Icon icon="spinner" alt="Progressing" /> : null}
             <span>
diff --git a/app/javascript/components/donations/TransactionForm.tsx b/app/javascript/components/donations/TransactionForm.tsx
index 06710731c7..c37e1330a3 100644
--- a/app/javascript/components/donations/TransactionForm.tsx
+++ b/app/javascript/components/donations/TransactionForm.tsx
@@ -1,26 +1,19 @@
-import React, { useState } from 'react'
-import { ExercismStripeElements } from './donation-form/ExercismStripeElements'
-import { StripeForm } from './StripeForm'
-import { PaymentIntentType } from './StripeForm'
+import React from 'react'
 import { AmountButton } from './donation-form/AmountButton'
 import { CustomAmountInput } from './donation-form/CustomAmountInput'
 
 type Props = {
-  defaultAmountInDollars: number
+  amountInDollars: number
   presetAmountsInDollars: number[]
-  transactionType: PaymentIntentType
-  onSuccess: (type: PaymentIntentType, amountInDollars: number) => void
+  onAmountChange: (value: number) => void
 }
 
 export const TransactionForm = ({
-  defaultAmountInDollars,
+  amountInDollars,
   presetAmountsInDollars,
-  transactionType,
-  onSuccess,
+  onAmountChange,
   children,
 }: React.PropsWithChildren<Props>): JSX.Element => {
-  const [amountInDollars, setAmountInDollars] = useState(defaultAmountInDollars)
-
   return (
     <React.Fragment>
       <div>
@@ -31,7 +24,7 @@ export const TransactionForm = ({
               <AmountButton
                 key={amount}
                 value={amount}
-                onClick={setAmountInDollars}
+                onClick={onAmountChange}
                 current={amountInDollars}
               />
             ))}
@@ -39,19 +32,11 @@ export const TransactionForm = ({
 
           <h3>Or specify a custom amount:</h3>
           <CustomAmountInput
-            onChange={setAmountInDollars}
-            defaultAmount={defaultAmountInDollars}
+            onChange={onAmountChange}
             selected={!presetAmountsInDollars.includes(amountInDollars)}
           />
         </div>
       </div>
-      <ExercismStripeElements>
-        <StripeForm
-          paymentIntentType={transactionType}
-          amountInDollars={amountInDollars}
-          onSuccess={onSuccess}
-        />
-      </ExercismStripeElements>
     </React.Fragment>
   )
 }
diff --git a/app/javascript/components/donations/donation-form/CustomAmountInput.tsx b/app/javascript/components/donations/donation-form/CustomAmountInput.tsx
index c6b1a98aa9..d068214e67 100644
--- a/app/javascript/components/donations/donation-form/CustomAmountInput.tsx
+++ b/app/javascript/components/donations/donation-form/CustomAmountInput.tsx
@@ -2,26 +2,18 @@ import React, { useCallback } from 'react'
 
 export const CustomAmountInput = ({
   onChange,
-  defaultAmount,
   selected,
 }: {
   onChange: (amount: number) => void
-  defaultAmount: number
   selected: boolean
 }): JSX.Element => {
   const handleCustomAmountChange = useCallback(
     (e: React.ChangeEvent<HTMLInputElement>) => {
       const amount = parseInt(e.target.value)
 
-      if (isNaN(amount)) {
-        onChange(defaultAmount)
-
-        return
-      }
-
       onChange(amount)
     },
-    [onChange, defaultAmount]
+    [onChange]
   )
 
   const classNames = ['c-faux-input', selected ? 'selected' : ''].filter(
diff --git a/test/controllers/api/donations/payment_intents_controller_test.rb b/test/controllers/api/donations/payment_intents_controller_test.rb
index 2895a894dd..755f7745bd 100644
--- a/test/controllers/api/donations/payment_intents_controller_test.rb
+++ b/test/controllers/api/donations/payment_intents_controller_test.rb
@@ -34,6 +34,24 @@ class Donations::PaymentIntentsControllerTest < API::BaseTestCase
       )
     end
 
+    test "returns an error if raised" do
+      error = "oh dear!!"
+      ::Donations::PaymentIntent::Create.expects(:call).raises(Stripe::InvalidRequestError.new(error, nil))
+
+      setup_user
+      post api_donations_payment_intents_path(
+        type: 'subscription', amount_in_dollars: 10
+      ), headers: @headers, as: :json
+
+      assert_response 200
+      assert_equal(
+        {
+          "error" => error
+        },
+        JSON.parse(response.body)
+      )
+    end
+
     #############
     # Succeeded #
     #############