From 138e8460f694d03fa1a84e9e95e7e6816de25c5c Mon Sep 17 00:00:00 2001
From: vitorsemeano <vitorsemeano@gmail.com>
Date: Wed, 11 Nov 2020 11:58:59 +0000
Subject: [PATCH] Update src/components/appRouter.js

Co-authored-by: Dmitry Lyzo <56478732+dmitrylyzo@users.noreply.github.com>
---
 src/components/appRouter.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/appRouter.js b/src/components/appRouter.js
index d096e5878b..76a76e516a 100644
--- a/src/components/appRouter.js
+++ b/src/components/appRouter.js
@@ -314,17 +314,18 @@ class AppRouter {
             url += '?' + ctx.querystring;
         }
 
+        let promise;
         if (route.serverRequest) {
             const apiClient = ServerConnections.currentApiClient();
-
             url = apiClient.getUrl(`/web${url}`);
-
-            apiClient.get(url).then(html => this.loadContent(ctx, route, html, request));
+            promise = apiClient.get(url);
         } else {
-            import(/* webpackChunkName: "[request]" */ `../controllers/${url}`).then((html) => {
-                this.loadContent(ctx, route, html, request);
-            });
+            promise = import(/* webpackChunkName: "[request]" */ `../controllers/${url}`);
         }
+
+        promise.then((html) => {
+            this.loadContent(ctx, route, html, request);
+        });
     }
 
     handleRoute(ctx, next, route) {