diff --git a/package-lock.json b/package-lock.json
index 4adc25ca..bf966f41 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "@sysvale/cuida",
-	"version": "3.144.0",
+	"version": "3.151.3",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@sysvale/cuida",
-			"version": "3.144.0",
+			"version": "3.151.3",
 			"dependencies": {
 				"@popperjs/core": "^2.11.6",
 				"@sysvale/cuida-icons": "^1.18.0",
diff --git a/package.json b/package.json
index bcb11935..89f87138 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sysvale/cuida",
-	"version": "3.151.2",
+	"version": "3.151.3",
 	"description": "A design system built by Sysvale, using storybook and Vue components",
 	"repository": {
 		"type": "git",
diff --git a/src/components/BaseInput.vue b/src/components/BaseInput.vue
index 9d7fd0a0..5f712854 100644
--- a/src/components/BaseInput.vue
+++ b/src/components/BaseInput.vue
@@ -108,7 +108,7 @@
 						:id="componentId"
 						ref="htmlInput"
 						v-bind="props"
-						v-model.trim="internalValue"
+						:model-value="internalValue"
 						:required="required"
 						:readonly="readonly"
 						:placeholder="placeholder"
@@ -119,6 +119,7 @@
 						@focus="handleFocus"
 						@blur="handleBlur"
 						@keydown="handleKeydown"
+						@input="(event) => internalValue = event.target.value.trim()"
 					>
 				</div>
 	
diff --git a/src/tests/NumberInput.spec.js b/src/tests/NumberInput.spec.js
index 6fba5d58..98fbf7e4 100644
--- a/src/tests/NumberInput.spec.js
+++ b/src/tests/NumberInput.spec.js
@@ -86,6 +86,9 @@ describe('CdsNumberInput', () => {
 	test('applies money mask and updates internal state correctly', async () => {
 		const wrapper = mount(CdsNumberInput, {
 			global: {
+				stubs: {
+					CdsBaseInput: true,
+				},
 				directives: {
 					CdsBrl: vCdsBrl, // Registre a diretiva
 				},
@@ -98,9 +101,11 @@ describe('CdsNumberInput', () => {
 
 		await wrapper.vm.$nextTick();
 
-		const input = wrapper.find('input');
+		const input = wrapper.findComponent(CdsBaseInput);
+
+		input.setValue('R$ 1.234,56');
 
-		await input.setValue('123456');
+		await wrapper.vm.$nextTick();
 
 		expect(wrapper.vm.model).toMatch(/R\$[\s\u00A0]1\.234,56/);
 		expect(wrapper.vm.unmaskedValue).toBe(1234.56);
diff --git a/src/tests/__snapshots__/BaseInput.spec.js.snap b/src/tests/__snapshots__/BaseInput.spec.js.snap
index 581ea22a..4ea831db 100644
--- a/src/tests/__snapshots__/BaseInput.spec.js.snap
+++ b/src/tests/__snapshots__/BaseInput.spec.js.snap
@@ -12,7 +12,7 @@ exports[`BaseInput > renders correctly 1`] = `
   <div data-v-82c69faf="" class="base-input base-input--default">
     <!--v-if-->
     <div data-v-82c69faf="" style="width: 100%;">
-      <!--v-if--><input data-v-82c69faf="" id="base-input" label="Label" hidelabel="false" state="default" type="text" placeholder="Digite aqui..." errormessage="Valor inválido" supportingtext="" fluid="false" tooltipicon="info-outline" floatinglabel="false" lazy="false" name="" enableautocomplete="false" enabletopcontent="false" class="base-input__field" autocomplete="off">
+      <!--v-if--><input data-v-82c69faf="" id="base-input" label="Label" hidelabel="false" state="default" type="text" placeholder="Digite aqui..." errormessage="Valor inválido" supportingtext="" fluid="false" tooltipicon="info-outline" floatinglabel="false" lazy="false" name="" enableautocomplete="false" enabletopcontent="false" model-value="" class="base-input__field" autocomplete="off">
     </div>
     <!--v-if-->
     <!--v-if-->
diff --git a/src/tests/__snapshots__/NumberInput.spec.js.snap b/src/tests/__snapshots__/NumberInput.spec.js.snap
index 9b878f18..6762077a 100644
--- a/src/tests/__snapshots__/NumberInput.spec.js.snap
+++ b/src/tests/__snapshots__/NumberInput.spec.js.snap
@@ -13,7 +13,7 @@ exports[`CdsNumberInput > renders correctly 1`] = `
     <div data-v-82c69faf="" class="base-input base-input--default">
       <!--v-if-->
       <div data-v-82c69faf="" style="width: 100%;">
-        <!--v-if--><input data-v-82c69faf="" id="number-input" modelvalue="" label="Valor" hidelabel="false" state="default" type="number" placeholder="Digite aqui a informação" errormessage="Valor inválido" supportingtext="" fluid="false" tooltipicon="info-outline" floatinglabel="false" lazy="false" name="" enableautocomplete="false" enabletopcontent="false" class="base-input__field" autocomplete="off">
+        <!--v-if--><input data-v-82c69faf="" id="number-input" modelvalue="" label="Valor" hidelabel="false" state="default" type="number" placeholder="Digite aqui a informação" errormessage="Valor inválido" supportingtext="" fluid="false" tooltipicon="info-outline" floatinglabel="false" lazy="false" name="" enableautocomplete="false" enabletopcontent="false" model-value="" class="base-input__field" autocomplete="off">
       </div>
       <!--v-if-->
       <!--v-if-->
diff --git a/src/tests/__snapshots__/Select.spec.js.snap b/src/tests/__snapshots__/Select.spec.js.snap
index 2669060c..012c6b90 100644
--- a/src/tests/__snapshots__/Select.spec.js.snap
+++ b/src/tests/__snapshots__/Select.spec.js.snap
@@ -14,7 +14,7 @@ exports[`Select > renders correctly 1`] = `
       <div data-v-82c69faf="" class="base-input base-input--default">
         <!--v-if-->
         <div data-v-82c69faf="" style="width: 100%;">
-          <!--v-if--><input data-v-82c69faf="" id="select-input" label="label" hidelabel="false" state="default" type="text" placeholder="Selecione..." errormessage="Valor inválido" supportingtext="" fluid="false" tooltipicon="info-outline" floatinglabel="false" lazy="false" readonly="" name="" enableautocomplete="false" enabletopcontent="false" class="base-input__field" autocomplete="off">
+          <!--v-if--><input data-v-82c69faf="" id="select-input" label="label" hidelabel="false" state="default" type="text" placeholder="Selecione..." errormessage="Valor inválido" supportingtext="" fluid="false" tooltipicon="info-outline" floatinglabel="false" lazy="false" readonly="" name="" enableautocomplete="false" enabletopcontent="false" model-value="" class="base-input__field" autocomplete="off">
         </div>
         <!--v-if-->
         <div data-v-82c69faf="" class="base-input__trailing-icon-container"><span data-v-96b70cc4="" class="select__chevron--closed"></span></div>
diff --git a/src/tests/__snapshots__/TextInput.spec.js.snap b/src/tests/__snapshots__/TextInput.spec.js.snap
index ed18aa6e..ce0b6df1 100644
--- a/src/tests/__snapshots__/TextInput.spec.js.snap
+++ b/src/tests/__snapshots__/TextInput.spec.js.snap
@@ -12,7 +12,7 @@ exports[`TextInput > renders correctly 1`] = `
   <div data-v-82c69faf="" class="base-input base-input--default">
     <!--v-if-->
     <div data-v-82c69faf="" style="width: 100%;">
-      <!--v-if--><input data-v-82c69faf="" id="text-input" modelvalue="" label="Label" hidelabel="false" state="default" type="text" placeholder="Digite aqui a informação" errormessage="Valor inválido" supportingtext="" fluid="false" tooltipicon="info-outline" floatinglabel="false" lazy="false" name="" enableautocomplete="true" enabletopcontent="false" class="base-input__field" autocomplete="on">
+      <!--v-if--><input data-v-82c69faf="" id="text-input" modelvalue="" label="Label" hidelabel="false" state="default" type="text" placeholder="Digite aqui a informação" errormessage="Valor inválido" supportingtext="" fluid="false" tooltipicon="info-outline" floatinglabel="false" lazy="false" name="" enableautocomplete="true" enabletopcontent="false" model-value="" class="base-input__field" autocomplete="on">
     </div>
     <!--v-if-->
     <!--v-if-->