diff --git a/src/app/page.tsx b/src/app/page.tsx
index 0f4e73c..ad17c1e 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -9,8 +9,8 @@ export const dynamic = 'force-dynamic'
 
 export default async function HomePage() {
 
-  const fromDate = moment().isoWeekday(1);
-  const tillDate = moment().isoWeekday(7);
+  const fromDate = moment().isoWeekday(1).hours(0).minutes(0);
+  const tillDate = moment().isoWeekday(7).hours(23).minutes(59);
   const events = await fetchEvents()
   const worship = await fetchWorship({
     fromDate: fromDate.toDate(),
diff --git a/src/components/EventRow/EventRow.tsx b/src/components/EventRow/EventRow.tsx
index 7526b97..78002c5 100644
--- a/src/components/EventRow/EventRow.tsx
+++ b/src/components/EventRow/EventRow.tsx
@@ -79,7 +79,7 @@ export const EventRow = ({date, title, location, cancelled, href, color = "base"
           { showDate &&
             <>
               {dateObj.toLocaleDateString("de-DE", { weekday: "long" })}
-              {dayFormat === "long" && " " + dateObj.toLocaleDateString("de-DE", { dateStyle: "medium" })}, {dateObj.toLocaleTimeString("de-DE", { timeStyle: "short" })} Uhr
+              {dayFormat === "long" && " " + dateObj.toLocaleDateString("de-DE", { dateStyle: "medium" })}, {dateObj.toLocaleTimeString("de-DE", { timeStyle: "short", timeZone: "Europe/Berlin" })} Uhr
               <br />
             </>
           }
diff --git a/src/hooks/useTime.ts b/src/hooks/useTime.ts
index 50cb05a..c3421a5 100644
--- a/src/hooks/useTime.ts
+++ b/src/hooks/useTime.ts
@@ -3,5 +3,5 @@
  */
 export const useTime = (datetime: string) => {
   let date = new Date(datetime)
-  return date.toLocaleTimeString('de-De', { timeStyle: 'short' })
+  return date.toLocaleTimeString('de-DE', { timeStyle: 'short', timeZone: "Europe/Berlin" })
 }
diff --git a/src/pageComponents/Worship/Worship.tsx b/src/pageComponents/Worship/Worship.tsx
index e70b297..33bccb6 100644
--- a/src/pageComponents/Worship/Worship.tsx
+++ b/src/pageComponents/Worship/Worship.tsx
@@ -22,7 +22,7 @@ export const Worship = ({ worship }: WorshipPageProps) => {
   const localeDate = useDate(worship.date)
   const liturgicalDay = worship.liturgicalDay ? worship.liturgicalDay : liturgicalDayName(worship.date);
   const what = worship.title ? worship.title : transformCategory(worship.type);
-  const time = date.toLocaleTimeString("de-DE", { timeStyle: "short" });
+  const time = date.toLocaleTimeString("de-DE", { timeStyle: "short", timeZone: "Europe/Berlin" });
 
   return (
     <>