diff --git a/package.json b/package.json
index a7fa4f8e..b6187dee 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sysvale/cuida",
-	"version": "3.152.0",
+	"version": "3.152.1",
 	"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 ec09c95b..3299f516 100644
--- a/src/components/BaseInput.vue
+++ b/src/components/BaseInput.vue
@@ -77,13 +77,12 @@
 					tabindex="0"
 					v-bind="props"
 					:placeholder="placeholder"
-					:disabled="disabled"
 					:class="inputClass"
 					:type="type"
 					:autocomplete="computedAutocompleteProp"
-					@focus="handleFocus"
-					@blur="handleBlur"
-					@keydown="handleKeydown"
+					@focus="disabled && handleFocus"
+					@blur="disabled && handleBlur"
+					@keydown="disabled && handleKeydown"
 				>
 					<small class="base-input__date-text">{{ internalValue || placeholder }}</small>
 				</div>