diff --git a/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js b/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js
index 23b999b3f0498709b35962ab3d5236e1e3cf1d96..e1f88cc741dbe280a3aeceb16ac2bc39f1bd6a45 100644
--- a/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js
+++ b/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js
@@ -2684,6 +2684,13 @@ if(client_id.toLowerCase() === 'android'){
     return decodeURIComponent(window.location.search.replace(new RegExp("^(?:.*[&\\?]" + encodeURIComponent(key).replace(/[\.\+\*]/g, "\\$&") + "(?:\\=([^&]*))?)?.*$", "i"), "$1"));
   }
 
+  function stringToHTML(str) {
+    let parser = new DOMParser();
+    let doc = parser.parseFromString(str, 'text/html');
+    console.log('Doc parse => ', doc); // TODO: log!
+    return doc?.body?.innerText || document.createElement('body');
+  }
+
   window.onload = function(){
     var mergeaccountprocess = (new URLSearchParams(window.location.search)).get('mergeaccountprocess');
     var version = getValueFromSession('version');
@@ -2708,13 +2715,16 @@ if(client_id.toLowerCase() === 'android'){
     }
     addVersionToURL(version);
     toggleGoogleSignInBtn();
-    var parser = new DOMParser();
+
     var error_message = (new URLSearchParams(window.location.search)).get('error_message');
     console.log('before error_message parse => ', error_message); // TODO: log!
-    if (error_message) error_message = parser.parseFromString(error_message, 'text/html');
+    if (error_message) error_message = stringToHTML(error_message);
     console.log('after error_message parse => ', error_message); // TODO: log!`
+
     var success_message = (new URLSearchParams(window.location.search)).get('success_message');
-    if (success_message) success_message = parser.parseFromString(success_message, 'text/html');
+    console.log('before success_message parse => ', success_message); // TODO: log!
+    if (success_message) success_message = stringToHTML(success_message);
+    console.log('after success_message parse => ', success_message); // TODO: log!`
 
     if(error_message){
         var error_msg = document.getElementById('error-msg');