diff --git a/lib/shared/device-list-utils.js b/lib/shared/device-list-utils.js
index a4dd0e385..c3fd3b10b 100644
--- a/lib/shared/device-list-utils.js
+++ b/lib/shared/device-list-utils.js
@@ -1,203 +1,228 @@
 // @flow
 
 import invariant from 'invariant';
 
 import type {
   IdentityServiceClient,
   RawDeviceList,
   SignedDeviceList,
 } from '../types/identity-service-types.js';
 import { getConfig } from '../utils/config.js';
 import { getContentSigningKey } from '../utils/crypto-utils.js';
 import {
   composeRawDeviceList,
   rawDeviceListFromSignedList,
 } from '../utils/device-list-utils.js';
 
 export type DeviceListVerificationResult =
   | { +valid: true, +deviceList: RawDeviceList }
   | DeviceListVerificationFailure;
 
 type DeviceListVerificationFailure =
   | { +valid: false, +reason: 'empty_device_list_history' }
   | { +valid: false, +reason: 'empty_device_list_update', +timestamp: number }
   | { +valid: false, +reason: 'invalid_timestamp_order', +timestamp: number }
   | {
       +valid: false,
       +reason: 'invalid_cur_primary_signature',
       +timestamp: number,
     }
   | {
       +valid: false,
       +reason: 'invalid_last_primary_signature',
       +timestamp: number,
     };
 
 // Verifies all device list updates for given `userID` since
 // last known (and valid) device list. The updates are fetched
 // from Identity Service. If `lastKnownDeviceList` is not provided,
 // the whole device list history will be verified.
 // Returns latest device list from Identity Service.
 async function verifyAndGetDeviceList(
   identityClient: IdentityServiceClient,
   userID: string,
   lastKnownDeviceList: ?SignedDeviceList,
 ): Promise<DeviceListVerificationResult> {
   let since;
   if (lastKnownDeviceList) {
     const rawList = rawDeviceListFromSignedList(lastKnownDeviceList);
     since = rawList.timestamp;
   }
 
   const history = await identityClient.getDeviceListHistoryForUser(
     userID,
     since,
   );
   if (history.length < 1) {
     return { valid: false, reason: 'empty_device_list_history' };
   }
 
   const [firstUpdate, ...updates] = history;
   const deviceListUpdates = lastKnownDeviceList ? history : updates;
   let previousDeviceList = lastKnownDeviceList ?? firstUpdate;
 
   const { olmAPI } = getConfig();
   for (const deviceList of deviceListUpdates) {
     const currentPayload = rawDeviceListFromSignedList(deviceList);
     const previousPayload = rawDeviceListFromSignedList(previousDeviceList);
 
     // verify timestamp order
     const { timestamp } = currentPayload;
     if (previousPayload.timestamp >= timestamp) {
       return {
         valid: false,
         reason: 'invalid_timestamp_order',
         timestamp,
       };
     }
 
     const currentPrimaryDeviceID = currentPayload.devices[0];
     const previousPrimaryDeviceID = previousPayload.devices[0];
     if (!currentPrimaryDeviceID || !previousPrimaryDeviceID) {
       return { valid: false, reason: 'empty_device_list_update', timestamp };
     }
 
     // verify signatures
     if (deviceList.curPrimarySignature) {
       // verify signature using previous primary device signature
       const signatureValid = await olmAPI.verifyMessage(
         deviceList.rawDeviceList,
         deviceList.curPrimarySignature,
         currentPrimaryDeviceID,
       );
       if (!signatureValid) {
         return {
           valid: false,
           reason: 'invalid_cur_primary_signature',
           timestamp,
         };
       }
     }
     if (
       currentPrimaryDeviceID !== previousPrimaryDeviceID &&
       deviceList.lastPrimarySignature
     ) {
       // verify signature using previous primary device signature
       const signatureValid = await olmAPI.verifyMessage(
         deviceList.rawDeviceList,
         deviceList.lastPrimarySignature,
         previousPrimaryDeviceID,
       );
       if (!signatureValid) {
         return {
           valid: false,
           reason: 'invalid_last_primary_signature',
           timestamp,
         };
       }
     }
 
     previousDeviceList = deviceList;
   }
 
   const deviceList = rawDeviceListFromSignedList(previousDeviceList);
   return { valid: true, deviceList };
 }
 
 async function createAndSignInitialDeviceList(
   primaryDeviceID: string,
 ): Promise<SignedDeviceList> {
   const initialDeviceList = composeRawDeviceList([primaryDeviceID]);
   const rawDeviceList = JSON.stringify(initialDeviceList);
   const { olmAPI } = getConfig();
   const curPrimarySignature = await olmAPI.signMessage(rawDeviceList);
   return {
     rawDeviceList,
     curPrimarySignature,
   };
 }
 
 async function signDeviceListUpdate(
   deviceListPayload: RawDeviceList,
 ): Promise<SignedDeviceList> {
   const deviceID = await getContentSigningKey();
   const rawDeviceList = JSON.stringify(deviceListPayload);
 
   // don't sign device list if current device is not a primary one
   if (deviceListPayload.devices[0] !== deviceID) {
     return {
       rawDeviceList,
     };
   }
 
   const { olmAPI } = getConfig();
   const curPrimarySignature = await olmAPI.signMessage(rawDeviceList);
   return {
     rawDeviceList,
     curPrimarySignature,
   };
 }
 
 async function fetchLatestDeviceList(
   identityClient: IdentityServiceClient,
   userID: string,
 ): Promise<RawDeviceList> {
   const deviceLists = await identityClient.getDeviceListHistoryForUser(userID);
   if (deviceLists.length < 1) {
     throw new Error('received empty device list history');
   }
 
   const lastSignedDeviceList = deviceLists[deviceLists.length - 1];
   return rawDeviceListFromSignedList(lastSignedDeviceList);
 }
 
 async function addDeviceToDeviceList(
   identityClient: IdentityServiceClient,
   userID: string,
   newDeviceID: string,
 ) {
   const { updateDeviceList } = identityClient;
   invariant(
     updateDeviceList,
     'updateDeviceList() should be defined on native. ' +
       'Are you calling it on a non-primary device?',
   );
 
   const { devices } = await fetchLatestDeviceList(identityClient, userID);
   if (devices.includes(newDeviceID)) {
     // the device was already on the device list
     return;
   }
 
   const newDeviceList = composeRawDeviceList([...devices, newDeviceID]);
   const signedDeviceList = await signDeviceListUpdate(newDeviceList);
   await updateDeviceList(signedDeviceList);
 }
 
+async function removeDeviceFromDeviceList(
+  identityClient: IdentityServiceClient,
+  userID: string,
+  deviceIDToRemove: string,
+): Promise<void> {
+  const { updateDeviceList } = identityClient;
+  invariant(
+    updateDeviceList,
+    'updateDeviceList() should be defined on native. ' +
+      'Are you calling it on a non-primary device?',
+  );
+
+  const { devices } = await fetchLatestDeviceList(identityClient, userID);
+  const newDevices = devices.filter(it => it !== deviceIDToRemove);
+  if (devices.length === newDevices.length) {
+    // the device wasn't on the device list
+    return;
+  }
+
+  const newDeviceList = composeRawDeviceList(newDevices);
+  const signedDeviceList = await signDeviceListUpdate(newDeviceList);
+  await updateDeviceList(signedDeviceList);
+}
+
 export {
   verifyAndGetDeviceList,
   createAndSignInitialDeviceList,
   fetchLatestDeviceList,
   addDeviceToDeviceList,
+  removeDeviceFromDeviceList,
   signDeviceListUpdate,
 };