diff --git a/src/common-components/textbox-question/textbox-question.vue b/src/common-components/textbox-question/textbox-question.vue
index 31437b8b9..673c1a263 100644
--- a/src/common-components/textbox-question/textbox-question.vue
+++ b/src/common-components/textbox-question/textbox-question.vue
@@ -19,6 +19,7 @@
 			:validationRules="validationRules"
 			@change="handleChange"
 			@blur="handleChange"
+			:maxlength="maxLength ? maxLength : '999'"
 		/>
 		<div v-show="errorMessage" class="row my-2 form-test-error">
 			<span class="d-inline-flex mt-0" role="alert">{{ errorMessage }}</span>
@@ -55,6 +56,7 @@ export default {
 		validationRules: String,
 		semiAggressiveValidation: Boolean,
 		cmsWidgetName: String,
+		maxLength: String,
 	},
 	setup(props) {
 		const propsClone = Object.assign({}, props);
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 541653898..1f4f6c9ce 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -24,6 +24,7 @@
               disableAutoFill
               validationRules="vin-required|vin-format"
               :isDisabled="isVinFieldReadOnly"
+              maxLength="17"
             />
           </div>
         </div>