diff --git a/lib/types/keyserver-types.js b/lib/types/keyserver-types.js
--- a/lib/types/keyserver-types.js
+++ b/lib/types/keyserver-types.js
@@ -12,6 +12,7 @@
   ...
 };
 
+// Native JS doesn't have a sessionID because the cookie is used instead.
 export type WebKeyserverInfo = {
   ...$Exact<BaseKeyserverInfo>,
   +sessionID: ?string,
diff --git a/lib/types/redux-types.js b/lib/types/redux-types.js
--- a/lib/types/redux-types.js
+++ b/lib/types/redux-types.js
@@ -151,14 +151,8 @@
   ...
 };
 
-// Web JS runtime doesn't have access to the cookie for security reasons.
-// Native JS doesn't have a sessionID because the cookieID is used instead.
-export type NativeAppState = BaseAppState<*, NativeKeyserverInfo> & {
-  sessionID?: void,
-  ...
-};
+export type NativeAppState = BaseAppState<*, NativeKeyserverInfo>;
 export type WebAppState = BaseAppState<*, WebKeyserverInfo> & {
-  sessionID: ?string,
   cryptoStore: CryptoStore,
   pushApiPublicKey: ?string,
   ...
diff --git a/lib/utils/sanitization.js b/lib/utils/sanitization.js
--- a/lib/utils/sanitization.js
+++ b/lib/utils/sanitization.js
@@ -5,6 +5,10 @@
 
 import { setNewSessionActionType } from './action-utils.js';
 import { setDeviceTokenActionTypes } from '../actions/device-actions.js';
+import type {
+  KeyserverStore,
+  KeyserverInfo,
+} from '../types/keyserver-types.js';
 import type { BaseAction, AppState } from '../types/redux-types.js';
 
 export type ReduxCrashReport = {
@@ -303,11 +307,15 @@
     }
     keyserverInfos[key] = { ...keyserverInfos[key], cookie: null };
   }
-  const keyserverStore = { ...state.keyserverStore, keyserverInfos };
+  const keyserverStore: KeyserverStore<KeyserverInfo> = {
+    ...state.keyserverStore,
+    keyserverInfos,
+  };
   // $FlowIssue[incompatible-type]
   state = { ...state, keyserverStore };
 
   if (state.deviceToken !== undefined && state.deviceToken !== null) {
+    // $FlowIssue[incompatible-type]
     state = { ...state, deviceToken: null };
   }
   const stateCopy = clone(state);
diff --git a/native/redux/state-types.js b/native/redux/state-types.js
--- a/native/redux/state-types.js
+++ b/native/redux/state-types.js
@@ -53,7 +53,6 @@
   reportStore: ReportStore,
   nextLocalID: number,
   _persist: ?PersistState,
-  sessionID?: void,
   dimensions: DimensionsInfo,
   connectivity: ConnectivityInfo,
   globalThemeInfo: GlobalThemeInfo,
diff --git a/web/redux/redux-setup.js b/web/redux/redux-setup.js
--- a/web/redux/redux-setup.js
+++ b/web/redux/redux-setup.js
@@ -75,7 +75,6 @@
   deviceID: ?string,
   currentUserInfo: ?CurrentUserInfo,
   draftStore: DraftStore,
-  sessionID: ?string,
   entryStore: EntryStore,
   threadStore: ThreadStore,
   userStore: UserStore,
@@ -159,7 +158,6 @@
 
     state = {
       ...state,
-      sessionID: action.payload.sessionChange.sessionID,
       keyserverStore: { ...state.keyserverStore, keyserverInfos },
     };
   } else if (