diff --git a/src/components/calendar/Calendar.vue b/src/components/calendar/Calendar.vue
index 24863a66b..fb8d4520e 100644
--- a/src/components/calendar/Calendar.vue
+++ b/src/components/calendar/Calendar.vue
@@ -1579,8 +1579,10 @@ export default {
                 let dayNo = 1;
                 let today = new Date();
                 let weekNumbers = [];
+                let monthRows = Math.ceil((daysLength + firstDay) / 7);
+
                 
-                for (let i = 0; i < 6; i++) {
+                for (let i = 0; i < monthRows; i++) {
                     let week = [];
                     
                     if (i == 0) {