diff --git a/packages/whatsapp.gblib/services/WhatsappDirectLine.ts b/packages/whatsapp.gblib/services/WhatsappDirectLine.ts
index 44b11c65..9f7251d8 100644
--- a/packages/whatsapp.gblib/services/WhatsappDirectLine.ts
+++ b/packages/whatsapp.gblib/services/WhatsappDirectLine.ts
@@ -268,9 +268,17 @@ export class WhatsappDirectLine extends GBService {
         if (req.body.entry[0].changes[0].value.messages[0].text) {
           text = req.body.entry[0].changes[0].value.messages[0].text.body;
         }
-        else {
+        else if (req.body.entry[0].changes[0].value.messages[0].button) {
           text = req.body.entry[0].changes[0].value.messages[0].button.text;
         }
+        else
+        {
+          res.status(200);
+          res.end();
+
+          return;
+
+        }
         
         from = req.body.entry[0].changes[0].value.messages[0].from;
         to = this.min.core.getParam<string>(this.min.instance, 'Bot Number', null);
@@ -835,12 +843,21 @@ export class WhatsappDirectLine extends GBService {
 
             return;
           }
+          
           if (req.body.entry[0].changes[0].value.messages[0].text) {
             text = req.body.entry[0].changes[0].value.messages[0].text.body;
           }
-          else {
+          else if (req.body.entry[0].changes[0].value.messages[0].button) {
             text = req.body.entry[0].changes[0].value.messages[0].button.text;
           }
+          else
+          {
+            res.status(200);
+            res.end();
+
+            return;
+
+          }
           id = req.body.entry[0].changes[0].value.messages[0].from;
           senderName = req.body.entry[0].changes[0].value.contacts[0].profile.name;