diff --git a/.eslintrc.js b/.eslintrc.js
index cf60fd91d..00e852c11 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -29,4 +29,7 @@ module.exports = {
     '@vue-storefront/eslint-config-vue',
     '@vue-storefront/eslint-config-jest',
   ],
+  rules: {
+    "@typescript-eslint/no-floating-promises": "off"
+  }
 }
diff --git a/packages/composables/src/factories/useStoreFactory.ts b/packages/composables/src/factories/useStoreFactory.ts
index 318f1ff4b..7f4ea7a5f 100644
--- a/packages/composables/src/factories/useStoreFactory.ts
+++ b/packages/composables/src/factories/useStoreFactory.ts
@@ -38,7 +38,7 @@ export function useStoreFactory<STORES, STORE,
     const change = async (store: ComposableFunctionArgs<STORE>): Promise<void> => {
       loading.value = true;
       try {
-        await _factoryParams.change(store);
+        _factoryParams.change(store);
       } finally {
         loading.value = false;
       }
diff --git a/packages/theme/components/CurrencySelector.vue b/packages/theme/components/CurrencySelector.vue
index 46f4f7726..e834cd773 100644
--- a/packages/theme/components/CurrencySelector.vue
+++ b/packages/theme/components/CurrencySelector.vue
@@ -104,7 +104,7 @@ export default defineComponent({
 
     const isCurrencyModalOpen = ref(false);
 
-    const availableCurrencies = computed(() => currencies.value?.available_currency_codes);
+    const availableCurrencies = computed(() => currencies.value?.available_currency_codes || []);
 
     return {
       currentCurrencySymbol,
diff --git a/packages/theme/composables/useMagentoConfiguration.ts b/packages/theme/composables/useMagentoConfiguration.ts
index c9346f666..154e21fff 100644
--- a/packages/theme/composables/useMagentoConfiguration.ts
+++ b/packages/theme/composables/useMagentoConfiguration.ts
@@ -44,7 +44,7 @@ export const useMagentoConfiguration: UseMagentoConfiguration = () => {
 
   const selectedStore = computed<string | undefined>(() => app.$cookies.get(cookieNames.storeCookieName));
 
-  const loadConfiguration: (params: { updateCookies: boolean; updateLocale: boolean; }) => Promise<void> = async (params = {
+  const loadConfiguration: (params: { updateCookies: boolean; updateLocale: boolean; }) => void = (params = {
     updateCookies: false,
     updateLocale: false,
   }) => {
@@ -52,11 +52,9 @@ export const useMagentoConfiguration: UseMagentoConfiguration = () => {
       updateCookies,
       updateLocale,
     } = params;
-    await Promise.all([
-      loadConfig(),
-      loadStores(),
-      loadCurrencies(),
-    ]);
+    loadConfig();
+    loadStores();
+    loadCurrencies();
 
     if (!app.$cookies.get(cookieNames.storeCookieName) || updateCookies) {
       app.$cookies.set(cookieNames.storeCookieName, storeConfigGetters.getCode(storeConfig.value));
diff --git a/packages/theme/layouts/default.vue b/packages/theme/layouts/default.vue
index c38521c29..e97386eb0 100644
--- a/packages/theme/layouts/default.vue
+++ b/packages/theme/layouts/default.vue
@@ -4,18 +4,30 @@
       <TopBar class="desktop-only" />
     </LazyHydrate>
 
-    <AppHeader />
+    <LazyHydrate when-visible>
+      <AppHeader />
+    </LazyHydrate>
 
     <div id="layout">
       <nuxt :key="route.fullPath" />
+    </div>
 
+    <LazyHydrate on-interaction>
       <BottomNavigation />
+    </LazyHydrate>
+    <LazyHydrate when-idle>
       <CartSidebar />
+    </LazyHydrate>
+    <LazyHydrate when-idle>
       <WishlistSidebar />
+    </LazyHydrate>
+    <LazyHydrate when-visible>
       <LoginModal />
+    </LazyHydrate>
+    <LazyHydrate when-idle>
       <Notification />
-    </div>
-    <LazyHydrate when-visible>
+    </LazyHydrate>
+    <LazyHydrate on-interaction>
       <AppFooter />
     </LazyHydrate>
   </div>
@@ -23,8 +35,7 @@
 
 <script>
 import LazyHydrate from 'vue-lazy-hydration';
-import { onSSR } from '@vue-storefront/core';
-import { useRoute, defineComponent } from '@nuxtjs/composition-api';
+import { useRoute, defineComponent, onMounted } from '@nuxtjs/composition-api';
 import {
   useUser,
 } from '@vue-storefront/magento';
@@ -56,12 +67,11 @@ export default defineComponent({
   setup() {
     const route = useRoute();
     const { load: loadUser } = useUser();
-
     const { loadConfiguration } = useMagentoConfiguration();
 
-    onSSR(async () => {
-      await loadConfiguration();
-      await loadUser();
+    onMounted(() => {
+      loadConfiguration();
+      loadUser();
     });
 
     return {