diff --git a/lib/utils/keyserver-store-utils.js b/lib/utils/keyserver-store-utils.js
index 2c2409b59..bf2688528 100644
--- a/lib/utils/keyserver-store-utils.js
+++ b/lib/utils/keyserver-store-utils.js
@@ -1,25 +1,19 @@
 // @flow
 
 import { authoritativeKeyserverID } from './authoritative-keyserver.js';
 import type { KeyserverStore } from '../types/keyserver-types.js';
+import { defaultKeyserverInfo } from '../types/keyserver-types.js';
 
 function wipeKeyserverStore(oldStore: KeyserverStore): KeyserverStore {
   const keyserverInfos = {
-    [authoritativeKeyserverID()]: {
-      ...oldStore.keyserverInfos[authoritativeKeyserverID()],
-      connection: {
-        ...oldStore.keyserverInfos[authoritativeKeyserverID()].connection,
-        connectionIssue: null,
-        queuedActivityUpdates: [],
-        lateResponses: [],
-      },
-      cookie: null,
-    },
+    [authoritativeKeyserverID()]: defaultKeyserverInfo(
+      oldStore.keyserverInfos[authoritativeKeyserverID()].urlPrefix,
+    ),
   };
   return {
     ...oldStore,
     keyserverInfos,
   };
 }
 
 export { wipeKeyserverStore };