diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index da41b23b525199aead22428c0d62898470300f58..e50474540b69ba80ac5bb251239ba7099813f228 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -25,6 +25,7 @@ Fixed
 * The configured theme colors were not used by the frontend.
 * Recurring events without until value weren't shown.
 * It wasn't possible to change icons of OAuth applications in the frontend.
+* First fetching of calendar feeds logged an error to console.
 
 `4.0`_ - 2025-03-29
 -------------------
diff --git a/aleksis/core/frontend/components/calendar/calendarSelectedFeedsMixin.js b/aleksis/core/frontend/components/calendar/calendarSelectedFeedsMixin.js
index adadc0ae77a74298a6a388241c10a81d57873df4..bb9587f50be3f67405fe42cb5003cc2124365279 100644
--- a/aleksis/core/frontend/components/calendar/calendarSelectedFeedsMixin.js
+++ b/aleksis/core/frontend/components/calendar/calendarSelectedFeedsMixin.js
@@ -17,9 +17,11 @@ const calendarSelectedFeedsMixin = {
     calendar: {
       query: gqlCalendarFeeds,
       result({ data }) {
-        this.selectedCalendarFeedNames = data.calendar.calendarFeeds
-          .filter((c) => c.activated)
-          .map((c) => c.name);
+        if (data) {
+          this.selectedCalendarFeedNames = data.calendar.calendarFeeds
+            .filter((c) => c.activated)
+            .map((c) => c.name);
+        }
       },
     },
   },