diff --git a/js/src/views/Event/GroupEvents.vue b/js/src/views/Event/GroupEvents.vue
index fb3cc1c1b..0d628c2e7 100644
--- a/js/src/views/Event/GroupEvents.vue
+++ b/js/src/views/Event/GroupEvents.vue
@@ -123,7 +123,7 @@ const { result: membershipsResult } = useQuery<{
   () => ({ enabled: currentActor.value?.id !== undefined })
 );
 const memberships = computed(
-  () => membershipsResult.value?.person.memberships.elements
+  () => membershipsResult.value?.person.memberships?.elements
 );
 
 const route = useRoute();
diff --git a/js/src/views/Group/GroupView.vue b/js/src/views/Group/GroupView.vue
index da4d9ef73..93a6c669c 100644
--- a/js/src/views/Group/GroupView.vue
+++ b/js/src/views/Group/GroupView.vue
@@ -543,7 +543,7 @@
                 :to="{
                   name: RouteName.GROUP_EVENTS,
                   params: { preferredUsername: usernameWithDomain(group) },
-                  query: { future: false },
+                  query: { showPassedEvents: true },
                 }"
                 >{{ t("View past events") }}</o-button
               >
@@ -559,7 +559,9 @@
               :to="{
                 name: RouteName.GROUP_EVENTS,
                 params: { preferredUsername: usernameWithDomain(group) },
-                query: { future: organizedEvents.elements.length > 0 },
+                query: {
+                  showPassedEvents: organizedEvents.elements.length === 0,
+                },
               }"
               >{{ t("View all events") }}</o-button
             >
@@ -696,7 +698,7 @@ const {
   group,
   loading: groupLoading,
   refetch: refetchGroup,
-} = useGroup(props.preferredUsername);
+} = useGroup(props.preferredUsername, { afterDateTime: new Date() });
 const router = useRouter();
 
 const { t } = useI18n({ useScope: "global" });