diff --git a/lib/reducers/master-reducer.js b/lib/reducers/master-reducer.js
--- a/lib/reducers/master-reducer.js
+++ b/lib/reducers/master-reducer.js
@@ -27,6 +27,7 @@
 import { reduceThreadInfos } from './thread-reducer.js';
 import reduceTunnelbrokerDeviceToken from './tunnelbroker-device-token-reducer.js';
 import { reduceCurrentUserInfo, reduceUserInfos } from './user-reducer.js';
+import { setClientDBStoreActionType } from '../actions/client-db-store-actions.js';
 import { addKeyserverActionType } from '../actions/keyserver-actions.js';
 import { fetchPendingUpdatesActionTypes } from '../actions/update-actions.js';
 import {
@@ -104,7 +105,8 @@
     action.type !== fetchPendingUpdatesActionTypes.success &&
     action.type !== legacyLogInActionTypes.success &&
     action.type !== keyserverAuthActionTypes.success &&
-    action.type !== addKeyserverActionType
+    action.type !== addKeyserverActionType &&
+    action.type !== setClientDBStoreActionType
   ) {
     const replaceOperations: ReplaceKeyserverOperation[] = [];
     for (const keyserverID in keyserverStore.keyserverInfos) {