diff --git a/lib/types/endpoints.js b/lib/types/endpoints.js
index 638b6095f..8f412a40c 100644
--- a/lib/types/endpoints.js
+++ b/lib/types/endpoints.js
@@ -1,139 +1,138 @@
 // @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>;
 
 const intialReduxStateEndpoints = Object.freeze({
   GET_INITIAL_REDUX_STATE: 'get_initial_redux_state',
 });
 type InitialReduxStateEndpoint = $Values<typeof intialReduxStateEndpoints>;
 
 type HTTPOnlyEndpoint =
   | SessionChangingEndpoint
   | UploadEndpoint
   | InitialReduxStateEndpoint;
 
 const socketOnlyEndpoints = Object.freeze({
   UPDATE_ACTIVITY: 'update_activity',
   UPDATE_CALENDAR_QUERY: 'update_calendar_query',
 });
 type SocketOnlyEndpoint = $Values<typeof socketOnlyEndpoints>;
 
-const socketPreferredEndpoints = Object.freeze({
+const socketPreferredEndpoints = Object.freeze({});
+type SocketPreferredEndpoint = $Values<typeof socketPreferredEndpoints>;
+
+const httpPreferredEndpoints = Object.freeze({
+  CREATE_REPORT: 'create_report',
+  CREATE_REPORTS: 'create_reports',
   CREATE_ENTRY: 'create_entry',
   CREATE_ERROR_REPORT: 'create_error_report',
   CREATE_MESSAGE_REPORT: 'create_message_report',
   CREATE_MULTIMEDIA_MESSAGE: 'create_multimedia_message',
   CREATE_OR_UPDATE_PUBLIC_LINK: 'create_or_update_public_link',
   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_COMMUNITY_ROLE: 'delete_community_role',
   DELETE_THREAD: 'delete_thread',
   DELETE_UPLOAD: 'delete_upload',
   DISABLE_INVITE_LINK: 'disable_invite_link',
   EXACT_SEARCH_USER: 'exact_search_user',
   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',
   MODIFY_COMMUNITY_ROLE: 'modify_community_role',
   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',
   CLAIM_USERNAME: 'claim_username',
   UPDATE_USER_AVATAR: 'update_user_avatar',
   UPLOAD_MEDIA_METADATA: 'upload_media_metadata',
   SEARCH_MESSAGES: 'search_messages',
   GET_OLM_SESSION_INITIALIZATION_DATA: 'get_olm_session_initialization_data',
   VERSION: 'version',
 });
-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);
 }