diff --git a/src/Client.tsx b/src/Client.tsx
index 3feaec860..e719c205b 100644
--- a/src/Client.tsx
+++ b/src/Client.tsx
@@ -139,6 +139,7 @@ export default class Client extends EventEmitter {
     logger: Logger,
     store: Store,
     plugins?: Plugins | null | undefined,
+    device?: BaseDevice,
   ) {
     super();
     this.connected = true;
@@ -156,9 +157,11 @@ export default class Client extends EventEmitter {
     this.activePlugins = new Set();
     this.lastSeenDeviceList = [];
 
-    this.device = new Promise((resolve, _reject) => {
-      this._deviceResolve = resolve;
-    });
+    this.device = device
+      ? Promise.resolve(device)
+      : new Promise((resolve, _reject) => {
+          this._deviceResolve = resolve;
+        });
 
     const client = this;
     // node.js doesn't support requestIdleCallback
diff --git a/src/utils/exportData.tsx b/src/utils/exportData.tsx
index 14dafaa89..c2e691430 100644
--- a/src/utils/exportData.tsx
+++ b/src/utils/exportData.tsx
@@ -612,6 +612,7 @@ export function importDataToStore(data: string, store: Store) {
         getLogger(),
         store,
         clientPlugins,
+        archivedDevice,
       ),
     });
   });