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/MonthAndYearPicker.vue b/src/components/MonthAndYearPicker.vue
index 3c9485da..f2a5d877 100644
--- a/src/components/MonthAndYearPicker.vue
+++ b/src/components/MonthAndYearPicker.vue
@@ -31,12 +31,12 @@
 				@mousedown.prevent="handleCalendarMouseDown"
 			>
 				<div class="dropdown__header">
-						<span
-							class="dropdown__month-and-title--no-hover"
-							@click="toggleYearPickerDisplay"
-						>
-							{{ currentYear }}
-						</span>
+					<span
+						class="dropdown__month-and-title--no-hover"
+						@click="toggleYearPickerDisplay"
+					>
+						{{ currentYear }}
+					</span>
 
 					<CdsFlexbox>
 						<CdsIcon
@@ -254,7 +254,7 @@ watch(datePickerRef, (newValue) => {
 function handleMonthSelection(selectedMonth) {
 	internalValue.value = internalValue.value ? internalValue.value : DateTime.now().setLocale('pt-BR').toFormat('dd/MM/yyyy');
 	showMonthPicker.value = !showMonthPicker.value;
-	let [day, month, year] = internalValue.value.toFormat('dd/MM/yyyy').split('/');
+	let [, month, year] = internalValue.value.toFormat('dd/MM/yyyy').split('/');
 	month = selectedMonth.index;
 
 	internalValue.value = DateTime.fromObject({ year: year, month: month }).setLocale('pt-BR');
@@ -287,15 +287,27 @@ function allowNextYearNavigation() {
 }
 
 function previousYear() {
-	if (allowPreviousYearNavigation()) {
-		internalValue.value = internalValue.value.minus({ year: 1 });
+	if (!allowPreviousYearNavigation()) return;
+
+	if (DateTime.min(internalValue.value.minus({ year: 1 }), minDateObj.value) !== minDateObj.value) {
+		internalValue.value = minDateObj.value;
+		model.value = internalValue.value.toFormat('yyyy-MM');
+		return;
 	}
+
+	internalValue.value = internalValue.value.minus({ year: 1 });
 }
 
 function nextYear() {
-	if (allowNextYearNavigation()) {
-		internalValue.value = internalValue.value.plus({ year: 1 });
+	if (!allowNextYearNavigation()) return;
+
+	if (DateTime.max(internalValue.value.plus({ year: 1 }), maxDateObj.value) !== maxDateObj.value) {
+		internalValue.value = maxDateObj.value;
+		model.value = internalValue.value.toFormat('yyyy-MM');
+		return;
 	}
+
+	internalValue.value = internalValue.value.plus({ year: 1 });
 }
 
 function toggleDatePicker() {