diff --git a/src/components/ConnectionStatus.vue b/src/components/ConnectionStatus.vue
index 7cf9542fb..9f5971705 100644
--- a/src/components/ConnectionStatus.vue
+++ b/src/components/ConnectionStatus.vue
@@ -15,9 +15,13 @@ export default {
   computed: mapState({
     message({ onLine, sdk }) {
       if (!onLine) return { text: this.$t('network.connection-status.offline') };
-      if (!sdk) return { text: this.$t('network.connection-status.no-sdk') };
-      if (sdk.then)
-        return { text: this.$t('network.connection-status.connecting'), className: 'connecting' };
+      const { networkId } = this.$store.state.sdkSync;
+      switch (networkId) {
+        case '_cant-connect':
+          return { text: this.$t('network.connection-status.cant-connect') };
+        case '_connecting':
+          return { text: this.$t('network.connection-status.connecting'), className: 'connecting' };
+      }
       if (!this.middlewareStatus) {
         return {
           text: this.$t('network.connection-status.middleware.unavailable'),
@@ -32,7 +36,7 @@ export default {
           className: 'connecting',
         };
       }
-      if (process.env.NODE_ENV === 'production' && sdk.getNetworkId() !== 'ae_mainnet') {
+      if (process.env.NODE_ENV === 'production' && networkId !== 'ae_mainnet') {
         return {
           text: this.$t('network.connection-status.connected-to-testnet'),
           className: 'test-net',
diff --git a/src/locales/cn.json b/src/locales/cn.json
index f859264ec..4e8602a15 100644
--- a/src/locales/cn.json
+++ b/src/locales/cn.json
@@ -556,7 +556,7 @@
   "network": {
     "connection-status": {
       "offline": "您已离线，请检查您的网络连接。",
-      "no-sdk": "我们无法连接到您选择的节点。",
+      "cant-connect": "我们无法连接到您选择的节点。",
       "connecting": "正在连接网络中...",
       "connected-to-testnet": "您已连接到测试网。",
       "middleware": {
diff --git a/src/locales/en.json b/src/locales/en.json
index 6e949ab17..e1eca0f66 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -556,7 +556,7 @@
   "network": {
     "connection-status": {
       "offline": "You are offline... Please check your connection.",
-      "no-sdk": "We are unable to connect to the chosen node.",
+      "cant-connect": "We are unable to connect to the chosen node.",
       "connecting": "Connecting to the network...",
       "connected-to-testnet": "You are connected to a testnet.",
       "middleware": {
diff --git a/src/locales/es.json b/src/locales/es.json
index eb94b048f..de236242c 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -556,7 +556,7 @@
   "network": {
     "connection-status": {
       "offline": "Estás desconectado... Comprueba tu conexión",
-      "no-sdk": "No podemos conectarnos al nodo elegido",
+      "cant-connect": "No podemos conectarnos al nodo elegido",
       "connecting": "Conectando a la red...",
       "connected-to-testnet": "Está conectado a una red de prueba",
       "middleware": {
diff --git a/src/locales/ru.json b/src/locales/ru.json
index 3745e2993..ce1f8124c 100644
--- a/src/locales/ru.json
+++ b/src/locales/ru.json
@@ -556,7 +556,7 @@
   "network": {
     "connection-status": {
       "offline": "Вы не в сети... Пожалуйста, проверьте ваше подключение к интернету.",
-      "no-sdk": "Мы не можем подключиться к выбранному узлу.",
+      "cant-connect": "Мы не можем подключиться к выбранному узлу.",
       "connecting": "Подключаемся к сети...",
       "connected-to-testnet": "Вы подключены к тестовой сети.",
       "middleware": {
diff --git a/src/pages/aens/AuctionBid.vue b/src/pages/aens/AuctionBid.vue
index 09db71d90..704741193 100644
--- a/src/pages/aens/AuctionBid.vue
+++ b/src/pages/aens/AuctionBid.vue
@@ -75,6 +75,7 @@
 import { pick, debounce } from 'lodash-es';
 import BigNumber from 'bignumber.js';
 import { mapGetters } from 'vuex';
+import { Name } from '@aeternity/aepp-sdk-next';
 import { MAGNITUDE } from '../../lib/constants';
 import blocksToRelativeTime from '../../filters/blocksToRelativeTime';
 import Page from '../../components/Page.vue';
@@ -144,7 +145,9 @@ export default {
       }
       this.busy = true;
       try {
-        await this.$store.state.sdk.aensBid(name, BigNumber(this.amount).shiftedBy(MAGNITUDE));
+        await new Name(name, this.$store.getters.sdk.getContext()).aensBid(
+          BigNumber(this.amount).shiftedBy(MAGNITUDE),
+        );
         this.$store.dispatch('modals/open', {
           name: 'notification',
           text: i18n.t('name.new.notification.bid', { name }),
diff --git a/src/pages/aens/NameList.vue b/src/pages/aens/NameList.vue
index 9f5a59a29..6f122e9e6 100644
--- a/src/pages/aens/NameList.vue
+++ b/src/pages/aens/NameList.vue
@@ -61,10 +61,7 @@ export default {
     NamePending,
     ButtonAddFixed,
   },
-  data: () => ({
-    auctions: [],
-    height: null,
-  }),
+  data: () => ({ auctions: [] }),
   computed: mapState('names', ['owned']),
   async mounted() {
     const fetchNames = () => this.$store.dispatch('names/fetchOwned');
@@ -90,17 +87,17 @@ export default {
           }),
         ),
       );
-      this.height ??= await this.$store.state.sdk.height();
+      const height = await this.$store.getters.sdk.getHeight({ cached: true });
       const recentlyClaimedNames = uniq(
         claims
           .map(({ data }) => data)
           .flat()
           // max auction length is 29760 blocks, but it can be increased multiple times by 120
-          .filter(({ blockHeight }) => blockHeight > this.height - 40000)
+          .filter(({ blockHeight }) => blockHeight > height - 40000)
           .map(({ tx: { name } }) => name.toLowerCase())
           .filter((name) => isNameValid(name) && isAuctionName(name)),
       );
-      const nodeNoRetry = new Node(this.$store.state.sdkUrl, { retryCount: 0 });
+      const nodeNoRetry = new Node(this.$store.node.$host, { retryCount: 0 });
       this.auctions = (
         await Promise.allSettled(
           recentlyClaimedNames.map((name) =>
diff --git a/src/pages/aens/NameNew.vue b/src/pages/aens/NameNew.vue
index 933326887..7354e9b38 100644
--- a/src/pages/aens/NameNew.vue
+++ b/src/pages/aens/NameNew.vue
@@ -39,6 +39,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
+import { Name } from '@aeternity/aepp-sdk-next';
 import { MAX_AUCTION_NAME_LENGTH } from '../../lib/constants';
 import { handleUnknownError, isNotFoundError } from '../../lib/utils';
 import { i18n } from '../../store/plugins/ui/languages';
@@ -62,7 +63,6 @@ export default {
     async handleSubmit() {
       if (!(await this.$validator.validateAll())) return;
       this.busy = true;
-      let claimTxHash;
 
       try {
         await this.$store.getters.node.getAuctionEntryByName(this.name);
@@ -82,11 +82,11 @@ export default {
         }
       }
 
+      const name = new Name(this.name, this.$store.getters.sdk.getContext());
+      let claimTxHash;
       try {
-        const { salt } = await this.$store.state.sdk.aensPreclaim(this.name);
-        claimTxHash = (await this.$store.state.sdk.aensClaim(this.name, salt, { waitMined: false }))
-          .hash;
-
+        await name.preclaim();
+        claimTxHash = (await name.claim({ waitMined: false })).hash;
         this.$store.dispatch('modals/open', {
           name: 'notification',
           text: this.$t('name.new.notification.claim-sent', { name: this.name }),
@@ -102,7 +102,7 @@ export default {
 
       try {
         this.$store.dispatch('names/fetchOwned');
-        await this.$store.state.sdk.poll(claimTxHash);
+        await this.$store.getters.sdk.poll(claimTxHash);
         const isAuction = MAX_AUCTION_NAME_LENGTH >= this.name.length;
         if (!isAuction) {
           await this.$store.dispatch('names/updatePointer', {
diff --git a/src/pages/aens/NameTransfer.vue b/src/pages/aens/NameTransfer.vue
index 0499d1728..5a629613c 100644
--- a/src/pages/aens/NameTransfer.vue
+++ b/src/pages/aens/NameTransfer.vue
@@ -51,6 +51,7 @@
 <script>
 import { mapState, mapGetters } from 'vuex';
 import { defer } from 'lodash-es';
+import { Name } from '@aeternity/aepp-sdk-next';
 import { handleUnknownError, getAddressByNameEntry } from '../../lib/utils';
 import Page from '../../components/Page.vue';
 import Guide from '../../components/Guide.vue';
@@ -149,8 +150,7 @@ export default {
             address: this.accountTo,
           });
         } else {
-          if (this.$store.state.sdk.then) await this.$store.state.sdk;
-          await this.$store.state.sdk.aensTransfer(this.nameEntry.name, this.accountTo);
+          await new Name(this.name, this.$store.getters.sdk.getContext()).transfer(this.accountTo);
         }
         this.$store.dispatch('modals/open', {
           name: 'notification',
diff --git a/src/pages/desktop/Send.vue b/src/pages/desktop/Send.vue
index 6344031b1..389bc53cb 100644
--- a/src/pages/desktop/Send.vue
+++ b/src/pages/desktop/Send.vue
@@ -100,7 +100,7 @@ export default {
       const amount = BigNumber(this.amount);
       this.busy = true;
       try {
-        const { hash } = await this.$store.state.sdk.spend(
+        const { hash } = await this.$store.getters.sdk.spend(
           amount.shiftedBy(MAGNITUDE),
           this.accountTo,
         );
diff --git a/src/pages/desktop/Settings.vue b/src/pages/desktop/Settings.vue
index aa32e7c73..293dbbc9c 100644
--- a/src/pages/desktop/Settings.vue
+++ b/src/pages/desktop/Settings.vue
@@ -123,8 +123,8 @@ export default {
   }),
   computed: {
     ...mapGetters(['currentNetwork']),
-    ...mapState({
-      networkId: (state) => state.sdk && state.sdk.getNetworkId && state.sdk.getNetworkId(),
+    ...mapState('sdkSync', {
+      networkId: (state) => state.networkId.startsWith('_') ? null : state.networkId,
     }),
   },
   methods: {
diff --git a/src/pages/mobile/AppBrowser.vue b/src/pages/mobile/AppBrowser.vue
index a433607da..27812f075 100644
--- a/src/pages/mobile/AppBrowser.vue
+++ b/src/pages/mobile/AppBrowser.vue
@@ -83,7 +83,7 @@ export default {
     },
   },
   async mounted() {
-    const sdk = this.$store.state.sdk.then ? await this.$store.state.sdk : this.$store.state.sdk;
+    const sdk = await this.$store.state.sdk;
 
     const connection = BrowserWindowMessageConnection({ target: this.$refs.iframe.contentWindow });
     sdk.addRpcClient(connection);
diff --git a/src/pages/mobile/RedeemBalance.vue b/src/pages/mobile/RedeemBalance.vue
index 4fb9e906a..70b320092 100644
--- a/src/pages/mobile/RedeemBalance.vue
+++ b/src/pages/mobile/RedeemBalance.vue
@@ -31,7 +31,7 @@
 <script>
 import { pick } from 'lodash-es';
 import BigNumber from 'bignumber.js';
-import { encode, Encoding, MemoryAccount, Node, transferFunds } from '@aeternity/aepp-sdk-next';
+import { encode, Encoding, MemoryAccount, transferFunds } from '@aeternity/aepp-sdk-next';
 import { handleUnknownError } from '../../lib/utils';
 import AeSpinner from '../../components/AeSpinner.vue';
 import Page from '../../components/Page.vue';
@@ -97,7 +97,7 @@ export default {
       const account = new MemoryAccount(
         encode(privateKey.subarray(0, 32), Encoding.AccountSecretKey),
       );
-      const sdk = this.$store.state.sdk.then ? await this.$store.state.sdk : this.$store.state.sdk;
+      const { sdk } = this.$store.getters;
       this.balance = BigNumber(await sdk.getBalance(account.address)).shiftedBy(-MAGNITUDE);
       if (this.balance < MIN_SPEND_TX_FEE) {
         await this.$store.dispatch('modals/open', {
@@ -116,7 +116,7 @@ export default {
         tx: { amount },
       } = await transferFunds(1, accountTo, {
         onAccount: this.inviteAccount,
-        onNode: new Node(this.$store.state.sdkUrl),
+        onNode: this.$store.getters.node,
       });
       this.$router.push({ name: 'transfer' });
       this.$store.dispatch('modals/open', {
diff --git a/src/pages/mobile/SendConfirm.vue b/src/pages/mobile/SendConfirm.vue
index 8f9603570..bf57b4427 100644
--- a/src/pages/mobile/SendConfirm.vue
+++ b/src/pages/mobile/SendConfirm.vue
@@ -28,8 +28,7 @@ export default {
         denominator: 3,
       });
       const amount = BigNumber(this.amount);
-      if (this.$store.state.sdk.then) await this.$store.state.sdk;
-      const { hash } = await this.$store.state.sdk.spend(amount.shiftedBy(MAGNITUDE), this.to);
+      const { hash } = await this.$store.getters.sdk.spend(amount.shiftedBy(MAGNITUDE), this.to);
 
       this.$router.push({ name: 'transfer' });
       this.$store.dispatch('modals/open', {
diff --git a/src/store/index.js b/src/store/index.js
index f9d9fa713..85bed40c9 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -14,6 +14,7 @@ import runMigrations from './migrations';
 import persistState from './plugins/persistState';
 import remoteConnection from './plugins/remoteConnection';
 import initSdk from './plugins/initSdk';
+import sdk from './plugins/sdk';
 import registerServiceWorker from './plugins/registerServiceWorker';
 import reverseIframe from './plugins/reverseIframe';
 import syncLedgerAccounts from './plugins/syncLedgerAccounts';
@@ -81,6 +82,7 @@ export default new Vuex.Store({
       }),
     ),
     initSdk,
+    sdk,
     ...(RUNNING_IN_POPUP
       ? []
       : [
diff --git a/src/store/modules/accounts/hdWallet.js b/src/store/modules/accounts/hdWallet.js
index ecbf3c494..a13562ea1 100644
--- a/src/store/modules/accounts/hdWallet.js
+++ b/src/store/modules/accounts/hdWallet.js
@@ -314,12 +314,11 @@ export default {
       return dispatch('signWithoutConfirmation', data);
     },
 
-    async signTransaction({ dispatch, rootState }, { transaction, signal }) {
-      const sdk = rootState.sdk.then ? await rootState.sdk : rootState.sdk;
+    async signTransaction({ dispatch, rootGetters: { node } }, { transaction, signal }) {
       const txWithFee = await dispatch('confirmTxSigning', { transaction, signal });
       const signature = await dispatch(
         'signWithoutConfirmation',
-        Buffer.concat([Buffer.from(sdk.getNetworkId()), decode(txWithFee)]),
+        Buffer.concat([Buffer.from(await node.getNetworkId()), decode(txWithFee)]),
       );
       return buildTx({ tag: Tag.SignedTx, encodedTx: txWithFee, signatures: [signature] });
     },
diff --git a/src/store/modules/root.js b/src/store/modules/root.js
index 741f99d17..436b8fc56 100644
--- a/src/store/modules/root.js
+++ b/src/store/modules/root.js
@@ -1,38 +1,10 @@
 /* eslint no-param-reassign: ["error", { "ignorePropertyModificationsFor": ["state"] }] */
 
 import Vue from 'vue';
-import { mergeWith, isPlainObject, camelCase } from 'lodash-es';
-import { Node, Middleware as MiddlewareOriginal } from '@aeternity/aepp-sdk-next';
+import { mergeWith } from 'lodash-es';
 import networksRegistry from '../../lib/networksRegistry';
 import { genRandomBuffer } from '../utils';
 
-class Middleware extends MiddlewareOriginal {
-  async sendOperationRequest(args, spec) {
-    // TODO: remove after fixing https://github.com/aeternity/aepp-sdk-js/issues/1986
-    if (args.options?.limit) this.limit = args.options?.limit;
-    const res = await super.sendOperationRequest(args, spec);
-    delete this.limit;
-
-    // TODO: remove after fixing https://github.com/aeternity/aepp-sdk-js/issues/1985
-    function mapKeysDeep(object, handler) {
-      if (Array.isArray(object)) return object.map((el) => mapKeysDeep(el, handler));
-      if (isPlainObject(object)) {
-        const entries = Object.entries(object).map(([key, value]) => [
-          handler(key),
-          mapKeysDeep(value, handler),
-        ]);
-        return Object.fromEntries(entries);
-      }
-      if (object?.data && object?.next && object?.prev) {
-        object.data = mapKeysDeep(object.data, handler);
-        return object;
-      }
-      return object;
-    }
-    return mapKeysDeep(res, camelCase);
-  }
-}
-
 const getAppByHost = (apps, appHost) => apps.find(({ host }) => host === appHost);
 
 export default {
@@ -60,8 +32,6 @@ export default {
         url: sdkUrl,
       },
     getApp: ({ apps }) => getAppByHost.bind(null, apps),
-    node: (_, { currentNetwork }) => new Node(currentNetwork.url),
-    middleware: (_, { currentNetwork }) => new Middleware(currentNetwork.middlewareUrl),
   },
 
   mutations: {
diff --git a/src/store/plugins/initSdk.js b/src/store/plugins/initSdk.js
index 1d8a3b9ce..544f93223 100644
--- a/src/store/plugins/initSdk.js
+++ b/src/store/plugins/initSdk.js
@@ -151,7 +151,7 @@ export default (store) => {
     async ([sdk, list]) => {
       syncAccountsPromise = (async () => {
         if (sdk == null) return;
-        if (sdk.then) await sdk.then;
+        await sdk;
         store.commit('setSdkAccounts', list);
       })();
       await syncAccountsPromise;
@@ -161,7 +161,7 @@ export default (store) => {
   store.watch(
     (_state, getters) => getters['accounts/active']?.address,
     async (address) => {
-      if (store.state.sdk.then) await store.state.sdk;
+      await store.state.sdk;
       await syncAccountsPromise;
       store.commit('selectSdkAccount', address);
     },
diff --git a/src/store/plugins/remoteConnection.js b/src/store/plugins/remoteConnection.js
index bf9dd712c..678473611 100644
--- a/src/store/plugins/remoteConnection.js
+++ b/src/store/plugins/remoteConnection.js
@@ -114,8 +114,8 @@ export default (store) => {
 
       const getRpcPeer = memoize((followerId) => new RpcPeer((response) => socket.emit('message-to-follower', followerId, response), {
         createAccount: () => store.dispatch('accounts/hdWallet/create'),
-        sign: markAbortable((data, options, signal) => store.state.sdk.sign(data, { ...options, signal })),
-        signTransaction: markAbortable((transaction, options, signal) => store.state.sdk.signTransaction(transaction, { ...options, signal })),
+        sign: markAbortable((data, options, signal) => store.getters.sdk.sign(data, { ...options, signal })),
+        signTransaction: markAbortable((transaction, options, signal) => store.getters.sdk.signTransaction(transaction, { ...options, signal })),
       }));
       socket.on(
         'message-from-follower',
diff --git a/src/store/plugins/sdk.js b/src/store/plugins/sdk.js
new file mode 100644
index 000000000..b6a9bf3fc
--- /dev/null
+++ b/src/store/plugins/sdk.js
@@ -0,0 +1,75 @@
+import { isPlainObject, camelCase } from 'lodash-es';
+import { Node, Middleware as MiddlewareOriginal, AeSdkMethods, AccountBase } from '@aeternity/aepp-sdk-next';
+
+class Middleware extends MiddlewareOriginal {
+  async sendOperationRequest(args, spec) {
+    // TODO: remove after fixing https://github.com/aeternity/aepp-sdk-js/issues/1986
+    if (args.options?.limit) this.limit = args.options?.limit;
+    const res = await super.sendOperationRequest(args, spec);
+    delete this.limit;
+
+    // TODO: remove after fixing https://github.com/aeternity/aepp-sdk-js/issues/1985
+    function mapKeysDeep(object, handler) {
+      if (Array.isArray(object)) return object.map((el) => mapKeysDeep(el, handler));
+      if (isPlainObject(object)) {
+        const entries = Object.entries(object).map(([key, value]) => [
+          handler(key),
+          mapKeysDeep(value, handler),
+        ]);
+        return Object.fromEntries(entries);
+      }
+      if (object?.data && object?.next && object?.prev) {
+        object.data = mapKeysDeep(object.data, handler);
+        return object;
+      }
+      return object;
+    }
+    return mapKeysDeep(res, camelCase);
+  }
+}
+
+class AccountStore extends AccountBase {
+  constructor(address, store) {
+    super();
+    this.address = address;
+    this._store = store;
+  }
+
+  sign(data, { signal }) {
+    return this._store.dispatch('accounts/sign', { data, signal });
+  }
+
+  signTransaction(transaction, { signal }) {
+    return this._store.dispatch('accounts/signTransaction', { transaction, signal });
+  }
+}
+
+export default (store) => {
+  store.registerModule('sdkSync', {
+    state: {
+      networkId: '',
+    },
+    getters: {
+      node: (_, { currentNetwork }) => new Node(currentNetwork.url),
+      middleware: (_, { currentNetwork }) => new Middleware(currentNetwork.middlewareUrl),
+      sdk: (_, getters) => new AeSdkMethods({
+        onNode: getters.node,
+        onAccount: new AccountStore(getters['accounts/active']?.address, store),
+      }),
+    },
+    mutations: {
+      setNetworkId(state, networkId) {
+        state.networkId = networkId;
+      },
+    }
+  });
+
+  store.watch(
+    (_state, { node }) => node,
+    async (node) => {
+      store.commit('setNetworkId', '_connecting');
+      store.commit('setNetworkId', await node.getNetworkId().catch(() => '_cant-connect'));
+    },
+    { immediate: true },
+  );
+};
diff --git a/src/store/plugins/ui/names.js b/src/store/plugins/ui/names.js
index 6b3b662b0..b617193ba 100644
--- a/src/store/plugins/ui/names.js
+++ b/src/store/plugins/ui/names.js
@@ -1,7 +1,7 @@
 /* eslint no-param-reassign: ["error", { "ignorePropertyModificationsFor": ["state"] }] */
 import BigNumber from 'bignumber.js';
 import Vue from 'vue';
-import { isAddressValid, produceNameId } from '@aeternity/aepp-sdk-next';
+import { isAddressValid, Name, produceNameId } from '@aeternity/aepp-sdk-next';
 import { MAGNITUDE } from '../../../lib/constants';
 import {
   handleUnknownError, isAccountNotFoundError, getAddressByNameEntry, isAensName,
@@ -40,8 +40,8 @@ export default (store) => {
         if (names[id].address) return names[id].address;
         return '';
       },
-      getDefault: ({ defaults }, getters, { sdk }) => (address) => (
-        sdk.then ? undefined : defaults[`${address}-${sdk.getNetworkId()}`]
+      getDefault: ({ defaults }, _getters, { sdkSync: { networkId } }) => (address) => (
+        defaults[`${address}-${networkId}`]
       ),
       isPending: ({ owned }) => (name) => (
         !!((owned.find((t) => t.name === name)) || {}).status === 'pending'
@@ -159,11 +159,10 @@ export default (store) => {
         commit('setDefault', { name, address, networkId: sdk.getNetworkId() });
       },
       async updatePointer({
-        rootState, state, commit, dispatch,
+        rootGetters, state, commit, dispatch,
       }, { name, address }) {
-        const sdk = await rootState.sdk;
-        const nameEntry = await sdk.api.getNameEntryByName(name);
-        await sdk.aensUpdate(
+        const nameEntry = await rootGetters.node.getNameEntryByName(name);
+        await (new Name(name, rootGetters.sdk.getContext())).update(
           name,
           address ? { account_pubkey: address } : {},
           { extendPointers: true },
diff --git a/src/store/plugins/ui/urlRequestHandler.js b/src/store/plugins/ui/urlRequestHandler.js
index 3b96c0d14..295b21bea 100644
--- a/src/store/plugins/ui/urlRequestHandler.js
+++ b/src/store/plugins/ui/urlRequestHandler.js
@@ -41,7 +41,7 @@ export default (store) => {
       return;
     }
     try {
-      if (store.state.sdk.then) await store.state.sdk;
+      await store.state.sdk;
       reply({
         result: await store.state.sdk[method](
           ...params,