diff --git a/src/common-components/textbox-question/textbox-question.vue b/src/common-components/textbox-question/textbox-question.vue
index f4a7d2afc..461e5a3c9 100644
--- a/src/common-components/textbox-question/textbox-question.vue
+++ b/src/common-components/textbox-question/textbox-question.vue
@@ -97,8 +97,8 @@ export default {
 			get: function () {
 				let labelText = this.questionText;
 				if (this.disableAutoFill) {
-					var noBreakChar = "⁠";
-					var position = 1;
+					const noBreakChar = "⁠";
+					const position = 1;
 					labelText = [labelText.slice(0, position), noBreakChar, labelText.slice(position)].join('');
 				}
 
diff --git a/src/constants/error-messages.js b/src/constants/error-messages.js
index 2b3382dc9..ded2ce333 100644
--- a/src/constants/error-messages.js
+++ b/src/constants/error-messages.js
@@ -11,6 +11,7 @@ const errorMessages = {
     CITY_REQUIRED: "Please enter your city",
     STATE_REQUIRED: "Please enter your state",
     ZIP_REQUIRED: "Please enter your ZIP",
+    ZIP_FORMAT: "Please enter a valid ZIP",
     FIRST_NAME_REQUIRED: "Please enter your first name",
     LAST_NAME_REQUIRED: "Please enter your last name",
     EMAIL_ADDRESS_REQUIRED: "Please enter your email address",
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index 0954caf34..975c298ad 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -16,7 +16,7 @@
 					<dropdownQuestion v-model="addressModel.state" ref="state" inputId="8fdf9dc2e13e430eb57529499dceb3eb" :options="stateOptions" disableAutoFill validationRules="state-required" />
 				</div>            
 				<div class="col-6">
-					<textboxQuestion v-model="addressModel.zip" ref="zip" inputId="01a9a1c2de0b4c9da8e023c9ae3be498" mask="#####" disableAutoFill validationRules="zip-required"/>
+					<textboxQuestion v-model="addressModel.zip" ref="zip" inputId="01a9a1c2de0b4c9da8e023c9ae3be498" mask="#####" disableAutoFill validationRules="zip-required|zip-format"/>
 				</div>      
 			</div> 
 		</div>
@@ -44,6 +44,7 @@ import { applicationConfig } from "@/constants/application-config.js";
 import { computed } from 'vue';
 import { defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
+import { regex } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
 //import store from "@/store";
 
@@ -52,6 +53,7 @@ defineRule("street-address-required", required(errorMessages.STREET_ADDRESS_REQU
 defineRule("city-required", required(errorMessages.CITY_REQUIRED));
 defineRule("state-required", required(errorMessages.STATE_REQUIRED));
 defineRule("zip-required", required(errorMessages.ZIP_REQUIRED));
+defineRule("zip-format", regex(/(^\d{5}$)|(^\d{5}-\d{4}$)/, errorMessages.ZIP_FORMAT));
 
 export default ({
 	name: "address-questions",