diff --git a/src/features/Calendars/CalendarApi.ts b/src/features/Calendars/CalendarApi.ts
index 2aca655..b4ab247 100644
--- a/src/features/Calendars/CalendarApi.ts
+++ b/src/features/Calendars/CalendarApi.ts
@@ -16,7 +16,7 @@ export async function getCalendars(userId: string, opaque_token: string) {
 
 export async function getCalendar(id: string, opaque_token: string) {
   const response = await fetch(
-    `${process.env.PUBLIC_CALENDAR_BASE_URL}/dav/calendars/${id}/${id}.json`,
+    `${process.env.PUBLIC_CALENDAR_BASE_URL}/dav/calendars/${id}.json`,
     {
       method: "REPORT",
       headers: {
diff --git a/src/features/Calendars/CalendarSlice.ts b/src/features/Calendars/CalendarSlice.ts
index cb4467e..03d5705 100644
--- a/src/features/Calendars/CalendarSlice.ts
+++ b/src/features/Calendars/CalendarSlice.ts
@@ -21,11 +21,9 @@ export const getCalendarsAsync = createAsyncThunk<
       ? cal["calendarserver:source"]._links.self.href
           .replace("/calendars/", "")
           .replace(".json", "")
-          .split("/")[0]
       : cal._links.self.href
           .replace("/calendars/", "")
           .replace(".json", "")
-          .split("/")[0];
 
     const color = cal["apple:color"];
     const calendarDetails = await getCalendar(id, access_token);
diff --git a/src/features/Calendars/CalendarTypes.ts b/src/features/Calendars/CalendarTypes.ts
index 363460f..25fed48 100644
--- a/src/features/Calendars/CalendarTypes.ts
+++ b/src/features/Calendars/CalendarTypes.ts
@@ -4,7 +4,7 @@ export interface Calendars {
   id: string;
   name: string;
   prodid?: string;
-  color: string;
+  color?: string;
   description?: string;
   calscale?: string;
   version?: string;