diff --git a/server/notification-providers/teams.js b/server/notification-providers/teams.js
index e8aab1a4..bf2cd764 100644
--- a/server/notification-providers/teams.js
+++ b/server/notification-providers/teams.js
@@ -52,7 +52,7 @@ class Teams extends NotificationProvider {
         monitorUrl,
         dashboardUrl,
     }) => {
-        const status = heartbeatJSON.status;
+        const status = heartbeatJSON?.status;
         const facts = [];
         const actions = [];
 
@@ -196,7 +196,9 @@ class Teams extends NotificationProvider {
      */
     _handleGeneralNotification = (webhookUrl, msg) => {
         const payload = this._notificationPayloadFactory({
-            monitorMessage: msg
+            heartbeatJSON: {
+                msg: msg
+            }
         });
 
         return this._sendNotification(webhookUrl, payload);