diff --git a/dist/index.js b/dist/index.js
index 454976ce..d383fd24 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -689,7 +689,7 @@
         this.settingsModel.firstDayOfWeek
       );
       console.log(firstWeekdayOfMonth, firstDayOfWeekSetting);
-      const offset = firstWeekdayOfMonth == 0 ? 7 - firstDayOfWeekSetting : firstWeekdayOfMonth - firstDayOfWeekSetting;
+      const offset = firstWeekdayOfMonth < firstDayOfWeekSetting ? 7 - firstDayOfWeekSetting : firstWeekdayOfMonth - firstDayOfWeekSetting;
       date.setMonth(month);
       date.setDate(-1);
       const daysInMonth = date.getDate() + 1;
diff --git a/src/Model/Files/calendarModel.ts b/src/Model/Files/calendarModel.ts
index 6137ccb4..14967364 100644
--- a/src/Model/Files/calendarModel.ts
+++ b/src/Model/Files/calendarModel.ts
@@ -77,7 +77,7 @@ export default class CalendarModel {
     console.log(firstWeekdayOfMonth, firstDayOfWeekSetting);
 
     const offset: number =
-      firstWeekdayOfMonth == 0
+      firstWeekdayOfMonth < firstDayOfWeekSetting
         ? 7 - firstDayOfWeekSetting
         : firstWeekdayOfMonth - firstDayOfWeekSetting;