diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index 6198b0b96..19b4a4fe4 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -1643,6 +1643,9 @@ define([
                     state: 2
                 });
                 userObject.migrate(waitFor());
+            }).nThen(function (waitFor) {
+                Store.initAnonRpc(null, null, waitFor());
+                Store.initRpc(null, null, waitFor());
             }).nThen(function (waitFor) {
                 loadMailbox(waitFor);
                 Migrate(proxy, waitFor(), function (version, progress) {
@@ -1651,8 +1654,6 @@ define([
                         progress: progress
                     });
                 });
-                Store.initAnonRpc(null, null, waitFor());
-                Store.initRpc(null, null, waitFor());
             }).nThen(function (waitFor) {
                 postMessage(clientId, 'LOADING_DRIVE', {
                     state: 3