diff --git a/client/app/controllers/subscription-update.js b/client/app/controllers/subscription-update.js
new file mode 100644
index 00000000..a22a3b5f
--- /dev/null
+++ b/client/app/controllers/subscription-update.js
@@ -0,0 +1,11 @@
+import Controller from '@ember/controller';
+import { action } from '@ember/object';
+
+export default class SubscriptionUpdateController extends Controller {
+    isSubmitting = false;
+
+    @action
+    setIsSubmitting(isSubmittingValue) {
+      this.set('isSubmitting', isSubmittingValue);
+    }
+}
\ No newline at end of file
diff --git a/client/app/templates/components/subscription-form.hbs b/client/app/templates/components/subscription-form.hbs
index 2c1d008a..55434719 100644
--- a/client/app/templates/components/subscription-form.hbs
+++ b/client/app/templates/components/subscription-form.hbs
@@ -67,7 +67,7 @@
     </div>
 
     <div class="subscribe-section">
-        {{#if isSubmitting}}
+        {{#if this.args.isSubmitting}}
             {{fa-icon icon='spinner' spin="true" size="5x" class="map-loading-spinner"}}
         {{/if}}
         <a class="button primary no-margin {{if this.canBeSubmitted "" "disabled"}}" type="submit" {{action "subscribe"}}>{{if this.args.isUpdate "Update" "Subscribe"}}</a>
diff --git a/client/app/templates/subscribe.hbs b/client/app/templates/subscribe.hbs
index a5cc9607..13481064 100644
--- a/client/app/templates/subscribe.hbs
+++ b/client/app/templates/subscribe.hbs
@@ -11,7 +11,7 @@
                         <div class="subscribe-section">
                             <div class="subscribe-input-group">
                             <label class="email-label">Email Address</label>
-                            <Input class="input-group-field" type="text" @value={{this.model.email}} onkeyup={{action 'continuouslyCheckEmail'}} onchange={{action 'checkExistingEmail'}} @disabled={{ this.isSubmitting }}/>
+                            <Input class="input-group-field" type="text" @value={{this.model.email}} onkeyup={{action 'continuouslyCheckEmail'}} onchange={{action 'checkExistingEmail'}} @disabled={{this.isSubmitting}}/>
                             </div>
                             {{#if this.emailAlreadyExists}}
                                 <p class="email-exists">This email already is subscribed to ZAP Updates. <a onclick={{action 'sendEmail'}}>Click here to receive an email to modify subscriptions.</a></p>
diff --git a/client/app/templates/subscription-update.hbs b/client/app/templates/subscription-update.hbs
index 49047ca4..31386558 100644
--- a/client/app/templates/subscription-update.hbs
+++ b/client/app/templates/subscription-update.hbs
@@ -9,7 +9,7 @@
                         <p></p>
                     <div class="update-type-question">To unsubscribe from a Community District or Citywide, uncheck the selected options below.</div>
                 </div>
-                    <SubscriptionForm @subscriptions={{this.model.subscriptions}} @email={{this.model.email}} @isUpdate={{true}} @id={{this.model.id}}>
+                    <SubscriptionForm @subscriptions={{this.model.subscriptions}} @email={{this.model.email}} @isUpdate={{true}} @id={{this.model.id}} @isSubmitting={{this.isSubmitting}} @setIsSubmitting={{this.setIsSubmitting}}>
                         <div class="subscribe-section">
                             <div class="subscribe-input-group">
                                 <label class="email-label">Email Address</label>