diff --git a/n8n-workflow.json b/n8n-workflow.json
index e80e88f..b7d6163 100644
--- a/n8n-workflow.json
+++ b/n8n-workflow.json
@@ -32,16 +32,15 @@
               "conditions": {
                 "options": {
                   "caseSensitive": true,
-                  "leftValue": "",
                   "typeValidation": "loose"
                 },
                 "conditions": [
                   {
                     "id": "has-message",
-                    "leftValue": "={{ $json.message }}",
+                    "leftValue": "={{ $json.message?.text }}",
                     "rightValue": "",
                     "operator": {
-                      "type": "object",
+                      "type": "string",
                       "operation": "notEmpty"
                     }
                   }
@@ -56,16 +55,15 @@
               "conditions": {
                 "options": {
                   "caseSensitive": true,
-                  "leftValue": "",
                   "typeValidation": "loose"
                 },
                 "conditions": [
                   {
                     "id": "has-callback",
-                    "leftValue": "={{ $json.callback_query }}",
+                    "leftValue": "={{ $json.callback_query?.id }}",
                     "rightValue": "",
                     "operator": {
-                      "type": "object",
+                      "type": "string",
                       "operation": "notEmpty"
                     }
                   }