diff --git a/dist/index.js b/dist/index.js
index ed22262e..454976ce 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -684,7 +684,12 @@
       date.setFullYear(year);
       date.setMonth(month - 1);
       date.setDate(1);
-      const offset = date.getDay() - parseInt(this.settingsModel.firstDayOfWeek);
+      const firstWeekdayOfMonth = date.getDay();
+      const firstDayOfWeekSetting = parseInt(
+        this.settingsModel.firstDayOfWeek
+      );
+      console.log(firstWeekdayOfMonth, firstDayOfWeekSetting);
+      const offset = firstWeekdayOfMonth == 0 ? 7 - firstDayOfWeekSetting : firstWeekdayOfMonth - firstDayOfWeekSetting;
       date.setMonth(month);
       date.setDate(-1);
       const daysInMonth = date.getDate() + 1;
@@ -3176,6 +3181,7 @@
       if (currentWeekday == 7) currentWeekday = 0;
     }
     const offsetElements = [];
+    console.log(monthGrid.offset);
     for (let i = 0; i < monthGrid.offset; i++) {
       offsetElements.push(/* @__PURE__ */ createElement("div", null));
     }
diff --git a/src/Model/Files/calendarModel.ts b/src/Model/Files/calendarModel.ts
index ec4938f5..6137ccb4 100644
--- a/src/Model/Files/calendarModel.ts
+++ b/src/Model/Files/calendarModel.ts
@@ -64,14 +64,22 @@ export default class CalendarModel {
     const isCurrentMonth: boolean =
       year == date.getFullYear() && month == date.getMonth() + 1;
 
-    // get first day of month
+    // get data for offset
     date.setFullYear(year);
     date.setMonth(month - 1);
     date.setDate(1);
 
-    // get offset
+    const firstWeekdayOfMonth = date.getDay();
+    const firstDayOfWeekSetting: number = parseInt(
+      this.settingsModel.firstDayOfWeek
+    );
+
+    console.log(firstWeekdayOfMonth, firstDayOfWeekSetting);
+
     const offset: number =
-      date.getDay() - parseInt(this.settingsModel.firstDayOfWeek);
+      firstWeekdayOfMonth == 0
+        ? 7 - firstDayOfWeekSetting
+        : firstWeekdayOfMonth - firstDayOfWeekSetting;
 
     // get total day count
     date.setMonth(month);
diff --git a/src/View/Components/monthGrid.tsx b/src/View/Components/monthGrid.tsx
index 42586535..c30e8e96 100644
--- a/src/View/Components/monthGrid.tsx
+++ b/src/View/Components/monthGrid.tsx
@@ -25,6 +25,7 @@ export function MonthGrid<T>(
   }
 
   const offsetElements: HTMLElement[] = [];
+  console.log(monthGrid.offset);
   for (let i = 0; i < monthGrid.offset; i++) {
     offsetElements.push(<div></div>);
   }