diff --git a/packages/webapp/public/index.html b/packages/webapp/public/index.html
index 1275c45f..fa49a2c7 100644
--- a/packages/webapp/public/index.html
+++ b/packages/webapp/public/index.html
@@ -1,4 +1,3 @@
-<!-- This is a temporal hack only with the purpose to allow the transition with Spring MVC-->
 <!DOCTYPE html>
 <html lang="en">
 
@@ -28,7 +27,7 @@
   <meta property="og:site_name" content="WiseMapping" />
 
   <script>
-    if ('<%=CLIENT_TYPE%>' === 'rest');
+    if ('<%=CLIENT_TYPE%>' === 'rest')
     {
       window.serverconfig = {
         apiBaseUrl: 'http://localhost:3000',
diff --git a/packages/webapp/src/classes/app-config/index.ts b/packages/webapp/src/classes/app-config/index.ts
index 5dbd9b10..2121938b 100644
--- a/packages/webapp/src/classes/app-config/index.ts
+++ b/packages/webapp/src/classes/app-config/index.ts
@@ -80,9 +80,9 @@ class _AppConfig {
   }
 
   buildClient(): Client {
-    const config = this.getInstance();
     let result: Client;
-    if (config.clientType == 'rest') {
+    if (this.isRestClient()) {
+      const config = this.getInstance();
       result = new RestClient(this.getBaseUrl());
       console.log('Service using rest client. ' + JSON.stringify(config));
     } else {
