diff --git a/keyserver/src/endpoints.js b/keyserver/src/endpoints.js
index 7285b3318..c7ab684c5 100644
--- a/keyserver/src/endpoints.js
+++ b/keyserver/src/endpoints.js
@@ -1,279 +1,286 @@
 // @flow
 
 import { baseLegalPolicies } from 'lib/facts/policies.js';
 import type { Endpoint } from 'lib/types/endpoints.js';
 
 import {
   updateActivityResponder,
   threadSetUnreadStatusResponder,
 } from './responders/activity-responders.js';
 import { deviceTokenUpdateResponder } from './responders/device-responders.js';
 import {
   entryFetchResponder,
   entryRevisionFetchResponder,
   entryCreationResponder,
   entryUpdateResponder,
   entryDeletionResponder,
   entryRestorationResponder,
   calendarQueryUpdateResponder,
 } from './responders/entry-responders.js';
 import type { JSONResponder } from './responders/handlers.js';
 import { getSessionPublicKeysResponder } from './responders/keys-responders.js';
-import { inviteLinkVerificationResponder } from './responders/link-responders.js';
+import {
+  fetchPrimaryInviteLinksResponder,
+  inviteLinkVerificationResponder,
+} from './responders/link-responders.js';
 import { messageReportCreationResponder } from './responders/message-report-responder.js';
 import {
   textMessageCreationResponder,
   messageFetchResponder,
   multimediaMessageCreationResponder,
   reactionMessageCreationResponder,
   editMessageCreationResponder,
   fetchPinnedMessagesResponder,
 } from './responders/message-responders.js';
 import { updateRelationshipsResponder } from './responders/relationship-responders.js';
 import {
   reportCreationResponder,
   reportMultiCreationResponder,
   errorReportFetchInfosResponder,
 } from './responders/report-responders.js';
 import { userSearchResponder } from './responders/search-responders.js';
 import { siweNonceResponder } from './responders/siwe-nonce-responders.js';
 import {
   threadDeletionResponder,
   roleUpdateResponder,
   memberRemovalResponder,
   threadLeaveResponder,
   threadUpdateResponder,
   threadCreationResponder,
   threadFetchMediaResponder,
   threadJoinResponder,
   toggleMessagePinResponder,
 } from './responders/thread-responders.js';
 import {
   userSubscriptionUpdateResponder,
   passwordUpdateResponder,
   sendVerificationEmailResponder,
   sendPasswordResetEmailResponder,
   logOutResponder,
   accountDeletionResponder,
   accountCreationResponder,
   logInResponder,
   siweAuthResponder,
   oldPasswordUpdateResponder,
   updateUserSettingsResponder,
   policyAcknowledgmentResponder,
   updateUserAvatarResponder,
 } from './responders/user-responders.js';
 import { codeVerificationResponder } from './responders/verification-responders.js';
 import {
   uploadMediaMetadataResponder,
   uploadDeletionResponder,
 } from './uploads/uploads.js';
 
 const jsonEndpoints: { [id: Endpoint]: JSONResponder } = {
   create_account: {
     responder: accountCreationResponder,
     requiredPolicies: [],
   },
   create_entry: {
     responder: entryCreationResponder,
     requiredPolicies: baseLegalPolicies,
   },
   create_error_report: {
     responder: reportCreationResponder,
     requiredPolicies: [],
   },
   create_message_report: {
     responder: messageReportCreationResponder,
     requiredPolicies: baseLegalPolicies,
   },
   create_multimedia_message: {
     responder: multimediaMessageCreationResponder,
     requiredPolicies: baseLegalPolicies,
   },
   create_reaction_message: {
     responder: reactionMessageCreationResponder,
     requiredPolicies: baseLegalPolicies,
   },
   edit_message: {
     responder: editMessageCreationResponder,
     requiredPolicies: baseLegalPolicies,
   },
   create_report: {
     responder: reportCreationResponder,
     requiredPolicies: [],
   },
   create_reports: {
     responder: reportMultiCreationResponder,
     requiredPolicies: [],
   },
   create_text_message: {
     responder: textMessageCreationResponder,
     requiredPolicies: baseLegalPolicies,
   },
   create_thread: {
     responder: threadCreationResponder,
     requiredPolicies: baseLegalPolicies,
   },
   delete_account: {
     responder: accountDeletionResponder,
     requiredPolicies: [],
   },
   delete_entry: {
     responder: entryDeletionResponder,
     requiredPolicies: baseLegalPolicies,
   },
   delete_thread: {
     responder: threadDeletionResponder,
     requiredPolicies: baseLegalPolicies,
   },
   delete_upload: {
     responder: uploadDeletionResponder,
     requiredPolicies: baseLegalPolicies,
   },
   fetch_entries: {
     responder: entryFetchResponder,
     requiredPolicies: baseLegalPolicies,
   },
   fetch_entry_revisions: {
     responder: entryRevisionFetchResponder,
     requiredPolicies: baseLegalPolicies,
   },
   fetch_error_report_infos: {
     responder: errorReportFetchInfosResponder,
     requiredPolicies: baseLegalPolicies,
   },
   fetch_messages: {
     responder: messageFetchResponder,
     requiredPolicies: baseLegalPolicies,
   },
   fetch_pinned_messages: {
     responder: fetchPinnedMessagesResponder,
     requiredPolicies: baseLegalPolicies,
   },
+  fetch_primary_invite_links: {
+    responder: fetchPrimaryInviteLinksResponder,
+    requiredPolicies: baseLegalPolicies,
+  },
   fetch_thread_media: {
     responder: threadFetchMediaResponder,
     requiredPolicies: baseLegalPolicies,
   },
   get_session_public_keys: {
     responder: getSessionPublicKeysResponder,
     requiredPolicies: baseLegalPolicies,
   },
   join_thread: {
     responder: threadJoinResponder,
     requiredPolicies: baseLegalPolicies,
   },
   leave_thread: {
     responder: threadLeaveResponder,
     requiredPolicies: baseLegalPolicies,
   },
   log_in: {
     responder: logInResponder,
     requiredPolicies: [],
   },
   log_out: {
     responder: logOutResponder,
     requiredPolicies: [],
   },
   policy_acknowledgment: {
     responder: policyAcknowledgmentResponder,
     requiredPolicies: [],
   },
   remove_members: {
     responder: memberRemovalResponder,
     requiredPolicies: baseLegalPolicies,
   },
   restore_entry: {
     responder: entryRestorationResponder,
     requiredPolicies: baseLegalPolicies,
   },
   search_users: {
     responder: userSearchResponder,
     requiredPolicies: baseLegalPolicies,
   },
   send_password_reset_email: {
     responder: sendPasswordResetEmailResponder,
     requiredPolicies: [],
   },
   send_verification_email: {
     responder: sendVerificationEmailResponder,
     requiredPolicies: [],
   },
   set_thread_unread_status: {
     responder: threadSetUnreadStatusResponder,
     requiredPolicies: baseLegalPolicies,
   },
   toggle_message_pin: {
     responder: toggleMessagePinResponder,
     requiredPolicies: baseLegalPolicies,
   },
   update_account: {
     responder: passwordUpdateResponder,
     requiredPolicies: baseLegalPolicies,
   },
   update_activity: {
     responder: updateActivityResponder,
     requiredPolicies: baseLegalPolicies,
   },
   update_calendar_query: {
     responder: calendarQueryUpdateResponder,
     requiredPolicies: baseLegalPolicies,
   },
   update_user_settings: {
     responder: updateUserSettingsResponder,
     requiredPolicies: baseLegalPolicies,
   },
   update_device_token: {
     responder: deviceTokenUpdateResponder,
     requiredPolicies: [],
   },
   update_entry: {
     responder: entryUpdateResponder,
     requiredPolicies: baseLegalPolicies,
   },
   update_password: {
     responder: oldPasswordUpdateResponder,
     requiredPolicies: baseLegalPolicies,
   },
   update_relationships: {
     responder: updateRelationshipsResponder,
     requiredPolicies: baseLegalPolicies,
   },
   update_role: {
     responder: roleUpdateResponder,
     requiredPolicies: baseLegalPolicies,
   },
   update_thread: {
     responder: threadUpdateResponder,
     requiredPolicies: baseLegalPolicies,
   },
   update_user_subscription: {
     responder: userSubscriptionUpdateResponder,
     requiredPolicies: baseLegalPolicies,
   },
   verify_code: {
     responder: codeVerificationResponder,
     requiredPolicies: baseLegalPolicies,
   },
   verify_invite_link: {
     responder: inviteLinkVerificationResponder,
     requiredPolicies: baseLegalPolicies,
   },
   siwe_nonce: {
     responder: siweNonceResponder,
     requiredPolicies: [],
   },
   siwe_auth: {
     responder: siweAuthResponder,
     requiredPolicies: [],
   },
   update_user_avatar: {
     responder: updateUserAvatarResponder,
     requiredPolicies: baseLegalPolicies,
   },
   upload_media_metadata: {
     responder: uploadMediaMetadataResponder,
     requiredPolicies: baseLegalPolicies,
   },
 };
 
 export { jsonEndpoints };
diff --git a/keyserver/src/fetchers/link-fetchers.js b/keyserver/src/fetchers/link-fetchers.js
index c9dd3d1fa..71fc05e2b 100644
--- a/keyserver/src/fetchers/link-fetchers.js
+++ b/keyserver/src/fetchers/link-fetchers.js
@@ -1,58 +1,83 @@
 // @flow
 
 import type {
+  InviteLink,
   InviteLinkVerificationRequest,
   InviteLinkVerificationResponse,
 } from 'lib/types/link-types.js';
 
 import { dbQuery, SQL } from '../database/database.js';
 import { Viewer } from '../session/viewer.js';
 
 async function verifyInviteLink(
   viewer: Viewer,
   request: InviteLinkVerificationRequest,
 ): Promise<InviteLinkVerificationResponse> {
   const query = SQL`
     SELECT c.name, i.community AS communityID, m.role
     FROM invite_links i
     INNER JOIN threads c ON c.id = i.community
     LEFT JOIN memberships m 
       ON m.thread = i.community AND m.user = ${viewer.userID}
     WHERE i.name = ${request.secret}
       AND c.community IS NULL
   `;
   const [result] = await dbQuery(query);
   if (result.length === 0) {
     return {
       status: 'invalid',
     };
   }
 
   const { name, communityID, role } = result[0];
   const status = role > 0 ? 'already_joined' : 'valid';
   return {
     status,
     community: {
       name,
       id: communityID.toString(),
     },
   };
 }
 
 async function checkIfInviteLinkIsValid(
   secret: string,
   communityID: string,
 ): Promise<boolean> {
   const query = SQL`
     SELECT i.id 
     FROM invite_links i
     INNER JOIN threads c ON c.id = i.community
     WHERE i.name = ${secret}
       AND i.community = ${communityID}
       AND c.community IS NULL
   `;
   const [result] = await dbQuery(query);
   return result.length === 1;
 }
 
-export { verifyInviteLink, checkIfInviteLinkIsValid };
+async function fetchPrimaryInviteLinks(
+  viewer: Viewer,
+): Promise<$ReadOnlyArray<InviteLink>> {
+  const query = SQL`
+    SELECT i.name, i.role, i.community, i.expiration_time AS expirationTime, 
+      i.limit_of_uses AS limitOfUses, i.number_of_uses AS numberOfUses, 
+      i.\`primary\`
+    FROM invite_links i
+    INNER JOIN memberships m 
+      ON i.community = m.thread AND m.user = ${viewer.userID}
+    WHERE i.\`primary\` = 1 AND m.role > 0
+  `;
+  const [result] = await dbQuery(query);
+  return result.map(row => ({
+    name: row.name,
+    primary: row.primary,
+    role: row.role.toString(),
+    communityID: row.community.toString(),
+    expirationTime: row.expirationTime,
+    limitOfUses: row.limitOfUses,
+    numberOfUses: row.numberOfUses,
+  }));
+}
+
+export { verifyInviteLink, checkIfInviteLinkIsValid, fetchPrimaryInviteLinks };
diff --git a/keyserver/src/responders/link-responders.js b/keyserver/src/responders/link-responders.js
index aeed8b4b2..6cf6e234c 100644
--- a/keyserver/src/responders/link-responders.js
+++ b/keyserver/src/responders/link-responders.js
@@ -1,32 +1,45 @@
 // @flow
 
 import t from 'tcomb';
 
 import type {
   InviteLinkVerificationRequest,
   InviteLinkVerificationResponse,
+  FetchInviteLinksResponse,
 } from 'lib/types/link-types.js';
 import { tShape } from 'lib/utils/validation-utils.js';
 
-import { verifyInviteLink } from '../fetchers/link-fetchers.js';
+import {
+  fetchPrimaryInviteLinks,
+  verifyInviteLink,
+} from '../fetchers/link-fetchers.js';
 import { Viewer } from '../session/viewer.js';
 import { validateInput } from '../utils/validation-utils.js';
 
 const inviteLinkVerificationRequestInputValidator = tShape({
   secret: t.String,
 });
 
 async function inviteLinkVerificationResponder(
   viewer: Viewer,
   input: any,
 ): Promise<InviteLinkVerificationResponse> {
   const request: InviteLinkVerificationRequest = input;
   await validateInput(
     viewer,
     inviteLinkVerificationRequestInputValidator,
     request,
   );
   return await verifyInviteLink(viewer, request);
 }
 
-export { inviteLinkVerificationResponder };
+async function fetchPrimaryInviteLinksResponder(
+  viewer: Viewer,
+): Promise<FetchInviteLinksResponse> {
+  const primaryLinks = await fetchPrimaryInviteLinks(viewer);
+  return {
+    links: primaryLinks,
+  };
+}
+
+export { inviteLinkVerificationResponder, fetchPrimaryInviteLinksResponder };
diff --git a/lib/types/endpoints.js b/lib/types/endpoints.js
index 71b5170da..c19820966 100644
--- a/lib/types/endpoints.js
+++ b/lib/types/endpoints.js
@@ -1,121 +1,122 @@
 // @flow
 
 export type APIRequest = {
   endpoint: Endpoint,
   input?: Object,
 };
 export type SocketAPIHandler = (request: APIRequest) => Promise<Object>;
 
 export type Endpoint =
   | HTTPOnlyEndpoint
   | SocketOnlyEndpoint
   | HTTPPreferredEndpoint
   | SocketPreferredEndpoint;
 
 // Endpoints that can cause session changes should occur over HTTP, since the
 // socket code does not currently support changing sessions. In the future they
 // could be made to work for native, but cookie changes on web require HTTP
 // since websockets aren't able to Set-Cookie. Note that technically any
 // endpoint can cause a sessionChange, and in that case the server will close
 // the socket with a specific error code, and the client will proceed via HTTP.
 const sessionChangingEndpoints = Object.freeze({
   LOG_OUT: 'log_out',
   DELETE_ACCOUNT: 'delete_account',
   CREATE_ACCOUNT: 'create_account',
   LOG_IN: 'log_in',
   UPDATE_PASSWORD: 'update_password',
   POLICY_ACKNOWLEDGMENT: 'policy_acknowledgment',
 });
 type SessionChangingEndpoint = $Values<typeof sessionChangingEndpoints>;
 
 // We do uploads over HTTP as well. This is because Websockets use TCP, which
 // guarantees ordering. That means that if we start an upload, any messages we
 // try to send the server after the upload starts will have to wait until the
 // upload ends. To avoid blocking other messages we upload using HTTP
 // multipart/form-data.
 const uploadEndpoints = Object.freeze({
   UPLOAD_MULTIMEDIA: 'upload_multimedia',
 });
 type UploadEndpoint = $Values<typeof uploadEndpoints>;
 
 type HTTPOnlyEndpoint = SessionChangingEndpoint | UploadEndpoint;
 
 const socketOnlyEndpoints = Object.freeze({
   UPDATE_ACTIVITY: 'update_activity',
   UPDATE_CALENDAR_QUERY: 'update_calendar_query',
 });
 type SocketOnlyEndpoint = $Values<typeof socketOnlyEndpoints>;
 
 const socketPreferredEndpoints = Object.freeze({
   CREATE_ENTRY: 'create_entry',
   CREATE_ERROR_REPORT: 'create_error_report',
   CREATE_MESSAGE_REPORT: 'create_message_report',
   CREATE_MULTIMEDIA_MESSAGE: 'create_multimedia_message',
   CREATE_REACTION_MESSAGE: 'create_reaction_message',
   EDIT_MESSAGE: 'edit_message',
   CREATE_TEXT_MESSAGE: 'create_text_message',
   CREATE_THREAD: 'create_thread',
   DELETE_ENTRY: 'delete_entry',
   DELETE_THREAD: 'delete_thread',
   DELETE_UPLOAD: 'delete_upload',
   FETCH_ENTRIES: 'fetch_entries',
   FETCH_ENTRY_REVISIONS: 'fetch_entry_revisions',
   FETCH_ERROR_REPORT_INFOS: 'fetch_error_report_infos',
   FETCH_MESSAGES: 'fetch_messages',
   FETCH_PINNED_MESSAGES: 'fetch_pinned_messages',
+  FETCH_PRIMARY_INVITE_LINKS: 'fetch_primary_invite_links',
   FETCH_THREAD_MEDIA: 'fetch_thread_media',
   GET_SESSION_PUBLIC_KEYS: 'get_session_public_keys',
   JOIN_THREAD: 'join_thread',
   LEAVE_THREAD: 'leave_thread',
   REMOVE_MEMBERS: 'remove_members',
   REQUEST_ACCESS: 'request_access',
   RESTORE_ENTRY: 'restore_entry',
   SEARCH_USERS: 'search_users',
   SEND_PASSWORD_RESET_EMAIL: 'send_password_reset_email',
   SEND_VERIFICATION_EMAIL: 'send_verification_email',
   SET_THREAD_UNREAD_STATUS: 'set_thread_unread_status',
   TOGGLE_MESSAGE_PIN: 'toggle_message_pin',
   UPDATE_ACCOUNT: 'update_account',
   UPDATE_USER_SETTINGS: 'update_user_settings',
   UPDATE_DEVICE_TOKEN: 'update_device_token',
   UPDATE_ENTRY: 'update_entry',
   UPDATE_RELATIONSHIPS: 'update_relationships',
   UPDATE_ROLE: 'update_role',
   UPDATE_THREAD: 'update_thread',
   UPDATE_USER_SUBSCRIPTION: 'update_user_subscription',
   VERIFY_CODE: 'verify_code',
   VERIFY_INVITE_LINK: 'verify_invite_link',
   SIWE_NONCE: 'siwe_nonce',
   SIWE_AUTH: 'siwe_auth',
   UPDATE_USER_AVATAR: 'update_user_avatar',
   UPLOAD_MEDIA_METADATA: 'upload_media_metadata',
 });
 type SocketPreferredEndpoint = $Values<typeof socketPreferredEndpoints>;
 
 const httpPreferredEndpoints = Object.freeze({
   CREATE_REPORT: 'create_report',
   CREATE_REPORTS: 'create_reports',
 });
 type HTTPPreferredEndpoint = $Values<typeof httpPreferredEndpoints>;
 
 const socketPreferredEndpointSet = new Set([
   ...Object.values(socketOnlyEndpoints),
   ...Object.values(socketPreferredEndpoints),
 ]);
 export function endpointIsSocketPreferred(endpoint: Endpoint): boolean {
   return socketPreferredEndpointSet.has(endpoint);
 }
 
 const socketSafeEndpointSet = new Set([
   ...Object.values(socketOnlyEndpoints),
   ...Object.values(socketPreferredEndpoints),
   ...Object.values(httpPreferredEndpoints),
 ]);
 export function endpointIsSocketSafe(endpoint: Endpoint): boolean {
   return socketSafeEndpointSet.has(endpoint);
 }
 
 const socketOnlyEndpointSet = new Set(Object.values(socketOnlyEndpoints));
 export function endpointIsSocketOnly(endpoint: Endpoint): boolean {
   return socketOnlyEndpointSet.has(endpoint);
 }
diff --git a/lib/types/link-types.js b/lib/types/link-types.js
index 0ce7a0695..98eaa7362 100644
--- a/lib/types/link-types.js
+++ b/lib/types/link-types.js
@@ -1,17 +1,31 @@
 // @flow
 
 export type InviteLinkVerificationRequest = {
   +secret: string,
 };
 
 export type InviteLinkVerificationResponse =
   | {
       +status: 'valid' | 'already_joined',
       +community: {
         +name: string,
         +id: string,
       },
     }
   | {
       +status: 'invalid' | 'expired',
     };
+
+export type InviteLink = {
+  +name: string,
+  +primary: boolean,
+  +role: string,
+  +communityID: string,
+  +expirationTime: number,
+  +limitOfUses: number,
+  +numberOfUses: number,
+};
+
+export type FetchInviteLinksResponse = {
+  +links: $ReadOnlyArray<InviteLink>,
+};