diff --git a/lib/reducers/keyserver-reducer.js b/lib/reducers/keyserver-reducer.js
index 03215d072..fcdf88c18 100644
--- a/lib/reducers/keyserver-reducer.js
+++ b/lib/reducers/keyserver-reducer.js
@@ -1,152 +1,163 @@
 // @flow
 
 import reduceConnectionInfo from './connection-reducer.js';
 import { reduceDeviceToken } from './device-token-reducer.js';
 import reduceLastCommunicatedPlatformDetails from './last-communicated-platform-details-reducer.js';
 import reduceUpdatesCurrentAsOf from './updates-reducer.js';
-import { addKeyserverActionType } from '../actions/keyserver-actions.js';
+import {
+  addKeyserverActionType,
+  removeKeyserverActionType,
+} from '../actions/keyserver-actions.js';
 import { siweAuthActionTypes } from '../actions/siwe-actions.js';
 import {
   logInActionTypes,
   resetUserStateActionType,
   logOutActionTypes,
   deleteAccountActionTypes,
 } from '../actions/user-actions.js';
 import type { KeyserverStore } from '../types/keyserver-types';
 import type { BaseAction } from '../types/redux-types.js';
 import {
   fullStateSyncActionType,
   incrementalStateSyncActionType,
 } from '../types/socket-types.js';
 import { processUpdatesActionType } from '../types/update-types.js';
 import { setNewSessionActionType } from '../utils/action-utils.js';
 import { setURLPrefix } from '../utils/url-utils.js';
 import { ashoatKeyserverID } from '../utils/validation-utils.js';
 
 export default function reduceKeyserverStore(
   state: KeyserverStore,
   action: BaseAction,
 ): KeyserverStore {
   if (
     action.type === logOutActionTypes.success ||
     action.type === deleteAccountActionTypes.success
   ) {
     state = {
       keyserverInfos: {
         [ashoatKeyserverID]: {
           ...state.keyserverInfos[ashoatKeyserverID],
         },
       },
     };
   } else if (action.type === addKeyserverActionType) {
     return {
       ...state,
       keyserverInfos: {
         ...state.keyserverInfos,
         [action.payload.keyserverAdminUserID]: {
           ...action.payload.newKeyserverInfo,
         },
       },
     };
+  } else if (action.type === removeKeyserverActionType) {
+    const { [action.payload.keyserverAdminUserID]: _, ...rest } =
+      state.keyserverInfos;
+
+    return {
+      ...state,
+      keyserverInfos: rest,
+    };
   } else if (action.type === resetUserStateActionType) {
     // this action is only dispatched on native
     const stateCookie = state.keyserverInfos[ashoatKeyserverID]?.cookie;
     const cookie =
       stateCookie && stateCookie.startsWith('anonymous=') ? stateCookie : null;
 
     const keyserverInfos = { ...state.keyserverInfos };
     for (const key in keyserverInfos) {
       keyserverInfos[key] = { ...keyserverInfos[key], cookie: null };
     }
 
     state = {
       ...state,
       keyserverInfos: {
         ...keyserverInfos,
         [ashoatKeyserverID]: {
           ...state.keyserverInfos[ashoatKeyserverID],
           cookie,
         },
       },
     };
   } else if (action.type === setNewSessionActionType) {
     if (action.payload.sessionChange.cookie !== undefined) {
       state = {
         ...state,
         keyserverInfos: {
           ...state.keyserverInfos,
           [ashoatKeyserverID]: {
             ...state.keyserverInfos[ashoatKeyserverID],
             cookie: action.payload.sessionChange.cookie,
           },
         },
       };
     }
   } else if (
     action.type === logInActionTypes.success ||
     action.type === siweAuthActionTypes.success ||
     action.type === fullStateSyncActionType ||
     action.type === incrementalStateSyncActionType ||
     action.type === processUpdatesActionType
   ) {
     const updatesCurrentAsOf = reduceUpdatesCurrentAsOf(
       state.keyserverInfos[ashoatKeyserverID].updatesCurrentAsOf,
       action,
     );
     state = {
       ...state,
       keyserverInfos: {
         ...state.keyserverInfos,
         [ashoatKeyserverID]: {
           ...state.keyserverInfos[ashoatKeyserverID],
           updatesCurrentAsOf,
         },
       },
     };
   } else if (action.type === setURLPrefix) {
     state = {
       ...state,
       keyserverInfos: {
         ...state.keyserverInfos,
         [ashoatKeyserverID]: {
           ...state.keyserverInfos[ashoatKeyserverID],
           urlPrefix: action.payload,
         },
       },
     };
   }
 
   const lastCommunicatedPlatformDetails = reduceLastCommunicatedPlatformDetails(
     state.keyserverInfos[ashoatKeyserverID].lastCommunicatedPlatformDetails,
     action,
   );
   const connection = reduceConnectionInfo(
     state.keyserverInfos[ashoatKeyserverID].connection,
     action,
   );
   const deviceToken = reduceDeviceToken(
     state.keyserverInfos[ashoatKeyserverID].deviceToken,
     action,
   );
   if (
     connection !== state.keyserverInfos[ashoatKeyserverID].connection ||
     lastCommunicatedPlatformDetails !==
       state.keyserverInfos[ashoatKeyserverID].lastCommunicatedPlatformDetails ||
     deviceToken !== state.keyserverInfos[ashoatKeyserverID].deviceToken
   ) {
     state = {
       ...state,
       keyserverInfos: {
         ...state.keyserverInfos,
         [ashoatKeyserverID]: {
           ...state.keyserverInfos[ashoatKeyserverID],
           connection,
           lastCommunicatedPlatformDetails,
           deviceToken,
         },
       },
     };
   }
 
   return state;
 }