diff --git a/src/digital-components/salesforce-webchat/salesforce-helper-dev.js b/src/digital-components/salesforce-webchat/salesforce-helper-dev.js
index 2e56634cc..a171fb974 100644
--- a/src/digital-components/salesforce-webchat/salesforce-helper-dev.js
+++ b/src/digital-components/salesforce-webchat/salesforce-helper-dev.js
@@ -7,9 +7,9 @@ function setupCustomSettings(
     onWebchatCloseCallback
 ) {
     modifyEmbeddedSvcCallback();
-    embeddedservice_bootstrap.addEventHandler("onSettingsCallCompleted", finishedLoadingCallback);
-    embeddedservice_bootstrap.addEventHandler("afterMaximize", onWebchatOpenCallback);
-    embeddedservice_bootstrap.addEventHandler("afterDestroy", onWebchatCloseCallback);
+    window.addEventListener("onEmbeddedMessagingReady", finishedLoadingCallback);
+    window.addEventListener("onEmbeddedMessagingWindowMaximized", onWebchatOpenCallback);
+    window.addEventListener("onEmbeddedMessagingWindowClosed", onWebchatCloseCallback);
 }
 
 /*
@@ -57,5 +57,4 @@ export function initializeSalesforceWebchatForDev(
     } catch (err) {
         console.error("Error loading Embedded Messaging: ", err);
     }
-
 }
diff --git a/src/digital-components/salesforce-webchat/salesforce-webchat.vue b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
index 93e966f3e..31719024e 100644
--- a/src/digital-components/salesforce-webchat/salesforce-webchat.vue
+++ b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
@@ -97,7 +97,7 @@ export default {
             window.embeddedservice_bootstrap.settings.prechatBackgroundImgURL = require("@/assets/img/salesforce-webchat/safelite_logo_webchat.png");
             window.embeddedservice_bootstrap.settings.smallCompanyLogoImgURL = require("@/assets/img/salesforce-webchat/minimized_chat_bubble_webchat.png");
             window.embeddedservice_bootstrap.settings.displayHelpButton = false;
-            window.embeddedservice_bootstrap.addEventHandler("onChatEstablished", () => {
+            window.addEventListener("onEmbeddedMessagingConversationStarted", () => {
                 this.pushEventForChatsToGA("support_chat", "chat_opened", "Live Agent", true);
             });
         },
diff --git a/src/digital-components/sierra-webchat/sierra-webchat.vue b/src/digital-components/sierra-webchat/sierra-webchat.vue
index 59c833dbf..6248ffa2d 100644
--- a/src/digital-components/sierra-webchat/sierra-webchat.vue
+++ b/src/digital-components/sierra-webchat/sierra-webchat.vue
@@ -165,7 +165,8 @@ export default {
                     ];
                     if (
                         window.embeddedservice_bootstrap.liveAgentAPI &&
-                        typeof window.embeddedservice_bootstrap.liveAgentAPI.startChat === "function"
+                        typeof window.embeddedservice_bootstrap.liveAgentAPI.startChat ===
+                            "function"
                     ) {
                         window.embeddedservice_bootstrap.liveAgentAPI.startChat();
                         return;