diff --git a/src/lib/group/List.svelte b/src/lib/group/List.svelte
index c91d9c4c..6b569c1b 100644
--- a/src/lib/group/List.svelte
+++ b/src/lib/group/List.svelte
@@ -290,7 +290,7 @@
 {#if !isPublic}
 <NewGroup on:create={addGroupToList} />
 {/if}
-{#if settings && settings.accessibility && !(settings.accessibility.pagelinks || settings.accessibility.expandedcards)}
+{#if settings && settings.accessibility ? (!settings.accessibility.expandedcards && !settings.accessibility.pagelinks) : true}
 <Accordion class="my-3" stayOpen>
     {#each slicedList as group, index (group.id)}
         {#if (!isPublic && group.privacy.visibility === "public") || isPublic}
diff --git a/src/lib/member/List.svelte b/src/lib/member/List.svelte
index 14e84fe0..77ce167c 100644
--- a/src/lib/member/List.svelte
+++ b/src/lib/member/List.svelte
@@ -293,7 +293,7 @@
 {#if !isPublic}
 <NewMember on:create={addMemberToList} />
 {/if}
-{#if settings && settings.accessibility && !(settings.accessibility.pagelinks || settings.accessibility.expandedcards)}
+{#if settings && settings.accessibility ? (!settings.accessibility.expandedcards && !settings.accessibility.pagelinks) : true}
 <Accordion class="my-3" stayOpen>
     {#each slicedList as member, index (member.id)}
             {#if (!isPublic && member.privacy.visibility === "public") || isPublic}
diff --git a/src/pages/Group.svelte b/src/pages/Group.svelte
index 5737d04c..c098fbd1 100644
--- a/src/pages/Group.svelte
+++ b/src/pages/Group.svelte
@@ -148,7 +148,7 @@
                 </CardHeader>
             </Card>
             <ListPagination bind:currentPage bind:pageAmount />
-            {#if settings && settings.accessibility && !(settings.accessibility.pagelinks || settings.accessibility.expandedcards)}
+            {#if settings && settings.accessibility ? (!settings.accessibility.expandedcards && !settings.accessibility.pagelinks) : true}
             <Accordion class="mb-3" stayOpen>
             {#each slicedMembers as member, index (member.id)}
             {#if (!isPublic && member.privacy.visibility === "public") || isPublic}
diff --git a/src/pages/Member.svelte b/src/pages/Member.svelte
index ad566ffb..61ee3e1f 100644
--- a/src/pages/Member.svelte
+++ b/src/pages/Member.svelte
@@ -154,7 +154,7 @@
                 </CardHeader>
             </Card>
             <ListPagination bind:currentPage bind:pageAmount />
-            {#if settings && settings.accessibility && !(settings.accessibility.pagelinks || settings.accessibility.expandedcards)}
+            {#if settings && settings.accessibility ? (!settings.accessibility.expandedcards && !settings.accessibility.pagelinks) : true}
             <Accordion class="mb-3" stayOpen>
             {#each slicedGroups as group, index (group.id)}
             {#if (!isPublic && group.privacy.visibility === "public") || isPublic}