diff --git a/anwendung/src/components/CalenderView.jsx b/anwendung/src/components/CalenderView.jsx
index ba5b78b..73cf1e9 100644
--- a/anwendung/src/components/CalenderView.jsx
+++ b/anwendung/src/components/CalenderView.jsx
@@ -536,7 +536,16 @@ export default function CalenderView(p) {
 
     function onMonthClick(monthIndex, startParts) {
         monthIndex--
-        let date = new Date(parseInt(startParts[2]), monthIndex, 1)
+        let startDay = 1
+        let date = new Date(parseInt(startParts[2]), monthIndex, startDay);
+        if(monthIndex + 1 == startParts[1] && startParts[0] != 1){
+            startDay = startParts[0];
+            date = new Date(parseInt(startParts[2]), monthIndex, startDay);
+        }
+        if(date.getDay() == 0){
+            startDay = parseInt(startDay.toString()) + 1
+            date = new Date(parseInt(startParts[2]), monthIndex, startDay);
+        }
         let start = new Date(date.getFullYear(), 0, 0)
         currentWeekStartDay = Math.round((date - start) / (1000 * 60 * 60 * 24))
         currentWeekStartDay = currentWeekStartDay - new Date(date.getFullYear(), 0, currentWeekStartDay).getUTCDay()
diff --git a/anwendung/src/components/WeekSelector.jsx b/anwendung/src/components/WeekSelector.jsx
index 69acfad..18f6e17 100644
--- a/anwendung/src/components/WeekSelector.jsx
+++ b/anwendung/src/components/WeekSelector.jsx
@@ -2,7 +2,6 @@ import Button from "@/components/Button";
 import DateElement from "@/components/DateElement";
 import { arrowLeft } from "./Icons"
 import { arrowRight } from "./Icons"
-import { useState } from 'react'