diff --git a/ui-ngx/package-lock.json b/ui-ngx/package-lock.json
index 0bba799e08..86dd99528b 100644
--- a/ui-ngx/package-lock.json
+++ b/ui-ngx/package-lock.json
@@ -5073,8 +5073,7 @@
     "es6-promise": {
       "version": "4.2.8",
       "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
-      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
-      "dev": true
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
     },
     "es6-promisify": {
       "version": "5.0.0",
@@ -10399,6 +10398,11 @@
       "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
       "dev": true
     },
+    "promise-polyfill": {
+      "version": "8.1.3",
+      "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.1.3.tgz",
+      "integrity": "sha512-MG5r82wBzh7pSKDRa9y+vllNHz3e3d4CNj1PQE4BQYxLme0gKYYBm9YENq+UkEikyZ0XbiGWxYlVw3Rl9O/U8g=="
+    },
     "promise-retry": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz",
diff --git a/ui-ngx/package.json b/ui-ngx/package.json
index 8a25206c32..1eb53444fa 100644
--- a/ui-ngx/package.json
+++ b/ui-ngx/package.json
@@ -47,6 +47,7 @@
     "compass-sass-mixins": "^0.12.7",
     "core-js": "^3.6.5",
     "date-fns": "^2.12.0",
+    "es6-promise": "^4.2.8",
     "flot": "git://github.com/thingsboard/flot.git#0.9-work",
     "flot.curvedlines": "git://github.com/MichaelZinsmaier/CurvedLines.git#master",
     "font-awesome": "^4.7.0",
@@ -73,6 +74,7 @@
     "ngx-hm-carousel": "^2.0.0-rc.1",
     "ngx-translate-messageformat-compiler": "^4.6.0",
     "objectpath": "^2.0.0",
+    "promise-polyfill": "8.1.3",
     "prop-types": "^15.7.2",
     "raphael": "^2.3.0",
     "rc-select": "^10.2.4",
diff --git a/ui-ngx/src/app/core/utils.ts b/ui-ngx/src/app/core/utils.ts
index b0ab617a42..5ee772a0c1 100644
--- a/ui-ngx/src/app/core/utils.ts
+++ b/ui-ngx/src/app/core/utils.ts
@@ -539,7 +539,7 @@ export function parseTemplate(template: string, data: object, translateFn?: (key
     }
     const expressions = template.match(/\{(.*?)\}/g);
     if (expressions) {
-      const clearMatches = template.match(/(?<=\{)(.+?)(?=(\}|\:))/g);
+      const clearMatches = template.match(/(.)/g);
       for (const key in data) {
         if (!key.includes('|'))
           variables += `let ${key} = '${clearMatches[key] ? padValue(data[key], +clearMatches[key]) : data[key]}';`;
diff --git a/ui-ngx/src/polyfills.ts b/ui-ngx/src/polyfills.ts
index 68a59ba5c3..0a1fed31cc 100644
--- a/ui-ngx/src/polyfills.ts
+++ b/ui-ngx/src/polyfills.ts
@@ -75,6 +75,7 @@
 import './zone-flags';
 import 'zone.js/dist/zone';  // Included with Angular CLI.
 import 'core-js/es/array';
+import { polyfill } from 'es6-promise'; polyfill();
 import moment from 'moment';
 
 /***************************************************************************************************