diff --git a/client/src/view-helper.js b/client/src/view-helper.js
index 179e0c7ec6..622d055300 100644
--- a/client/src/view-helper.js
+++ b/client/src/view-helper.js
@@ -679,7 +679,7 @@ function (marked, DOMPurify, /** typeof Handlebars */Handlebars) {
          *
          * @param {string} text A text.
          * @param {{inline?: boolean, linksInNewTab?: boolean}} [options] Options.
-         * @returns {string} HTML.
+         * @returns {Handlebars.SafeString} HTML.
          */
         transformMarkdownText: function (text, options) {
             text = text || '';
@@ -710,7 +710,7 @@ function (marked, DOMPurify, /** typeof Handlebars */Handlebars) {
                 '<a type="button" class="selectable" data-email-address="$1" data-action="mailTo"'
             );
 
-            return (new Handlebars.SafeString(text)).toString();
+            return new Handlebars.SafeString(text);
         },
 
         /**
diff --git a/client/src/views/import-error/fields/validation-failures.js b/client/src/views/import-error/fields/validation-failures.js
index 14cf8f5242..3eee2bde39 100644
--- a/client/src/views/import-error/fields/validation-failures.js
+++ b/client/src/views/import-error/fields/validation-failures.js
@@ -79,7 +79,7 @@ define('views/import-error/fields/validation-failures', ['views/fields/base'], (
 
         afterRenderDetail: function () {
             this.$el.find('.popover-anchor').each((i, el) => {
-                let text = this.getHelper().transformMarkdownText(el.dataset.text);
+                let text = this.getHelper().transformMarkdownText(el.dataset.text).toString();
 
                 Espo.Ui.popover($(el), {content: text}, this);
             });