diff --git a/package-lock.json b/package-lock.json
index a136d384..9174bb30 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "@sysvale/cuida",
-	"version": "3.154.6",
+	"version": "3.154.7",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@sysvale/cuida",
-			"version": "3.154.6",
+			"version": "3.154.7",
 			"dependencies": {
 				"@popperjs/core": "^2.11.6",
 				"@sysvale/cuida-icons": "^1.18.0",
diff --git a/package.json b/package.json
index abcc627d..06bef20b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sysvale/cuida",
-	"version": "3.154.6",
+	"version": "3.154.7",
 	"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 ae676a85..05c47268 100644
--- a/src/components/BaseInput.vue
+++ b/src/components/BaseInput.vue
@@ -59,7 +59,7 @@
 					v-if="type === 'textarea'"
 					:id="componentId"
 					ref="htmlInput"
-					v-model.trim="internalValue"
+					v-model="internalValue"
 					:required="required"
 					:placeholder="placeholder"
 					:disabled="disabled"
@@ -103,7 +103,7 @@
 						:id="componentId"
 						ref="htmlInput"
 						v-bind="props"
-						v-model.trim="internalValue"
+						v-model="internalValue"
 						:required="required"
 						:readonly="readonly"
 						:placeholder="placeholder"
@@ -526,6 +526,11 @@ function handleFocus(event) {
 
 function handleBlur(event) {
 	isFocused.value = false;
+
+	if (htmlInputRef.value && htmlInputRef.value.value !== undefined) {
+		internalValue.value = htmlInputRef.value.value;
+	}
+
 	/**
 	* Evento emitido quando o componente deixa de ser focado.
 	* @event blur
diff --git a/src/components/BaseMobileInput.vue b/src/components/BaseMobileInput.vue
index c8810a14..43b79f34 100644
--- a/src/components/BaseMobileInput.vue
+++ b/src/components/BaseMobileInput.vue
@@ -575,6 +575,11 @@ function handleFocus(event) {
 
 function handleBlur(event) {
 	isFocused.value = false;
+
+	if (componentRef.value && componentRef.value.value !== undefined) {
+		internalValue.value = componentRef.value.value;
+	}
+
 	/**
 	* Evento emitido quando o componente deixa de ser focado.
 	* @event blur
diff --git a/src/components/TextArea.vue b/src/components/TextArea.vue
index a45c4039..ff30d973 100644
--- a/src/components/TextArea.vue
+++ b/src/components/TextArea.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script setup>
-import { ref, watch, useTemplateRef } from 'vue';
+import { ref, watch, useTemplateRef, computed } from 'vue';
 import {
 	nativeEvents,
 	nativeEmits,
@@ -155,8 +155,8 @@ watch(internalValue, (value) => {
 
 /* EXPOSE */
 defineExpose({
-	componentRef: baseInputRef.value?.componentRef,
-	isFocused: baseInputRef.value?.isFocused,
+	componentRef: computed(() => baseInputRef.value?.componentRef),
+	isFocused: computed(() => baseInputRef.value?.isFocused),
 	focus: () => baseInputRef.value?.focus(),
 	blur: () => baseInputRef.value?.blur(),
 	clear: () => baseInputRef.value?.clear(),
diff --git a/src/components/TextInput.vue b/src/components/TextInput.vue
index ebcac1d8..554bc07c 100644
--- a/src/components/TextInput.vue
+++ b/src/components/TextInput.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script setup>
-import { ref, watch, useTemplateRef } from 'vue';
+import { ref, watch, useTemplateRef, computed } from 'vue';
 import {
 	nativeEvents,
 	nativeEmits,
@@ -32,7 +32,7 @@ defineOptions({ name: 'CdsTextInput' });
 
 const vFacade = facade;
 
-const componentRef = useTemplateRef('baseInput');
+const baseInputRef = useTemplateRef('baseInput');
 
 const model = defineModel('modelValue', {
 	type: String,
@@ -203,16 +203,17 @@ watch(model, (newValue, oldValue) => {
 
 watch(internalValue, (value) => {
 	model.value = value;
-	componentRef.value = componentRef.value?.componentRef;
 });
 
+const componentRef = computed(() => baseInputRef.value?.componentRef);
+
 /* EXPOSE */
 defineExpose({
 	componentRef,
-	isFocused: componentRef.value?.isFocused,
-	focus: () => componentRef.value?.focus(),
-	blur: () => componentRef.value?.blur(),
-	clear: () => componentRef.value?.clear(),
-	select: () => componentRef.value?.select(),
+	isFocused: computed(() => baseInputRef.value?.isFocused),
+	focus: () => baseInputRef.value?.focus(),
+	blur: () => baseInputRef.value?.blur(),
+	clear: () => baseInputRef.value?.clear(),
+	select: () => baseInputRef.value?.select(),
 });
 </script>