diff --git a/templates/components/save_button.html b/templates/components/save_button.html
index 4adb6e37..919cc73b 100644
--- a/templates/components/save_button.html
+++ b/templates/components/save_button.html
@@ -1,10 +1,10 @@
 {% macro SaveButton(text, element="button", additional_classes="", form=None) -%}
   {% set class = "usa-button usa-button-primary" + additional_classes %}
   {% if element == "button" %}
-    <button type="submit" class="{{ class }}" tabindex="0" v-bind:disabled="!changed" {{ form_attr }} >
+    <button type="submit" class="{{ class }}" tabindex="0" v-bind:disabled="!changed || invalid" {{ form_attr }} >
       {{ text }}
     </button>
   {% elif element == 'input' %}
-    <input type="submit" class="{{ class }}" tabindex="0" v-bind:disabled="!changed" value="{{ text }}" {% if form %}form="{{ form }}"{% endif %} />
+    <input type="submit" class="{{ class }}" tabindex="0" v-bind:disabled="!changed || invalid" value="{{ text }}" {% if form %}form="{{ form }}"{% endif %} />
   {% endif %}
 {%- endmacro %}