diff --git a/libraries/botbuilder-dialogs-adaptive/schemas/TriggerConditions/Microsoft.OnError.schema b/libraries/botbuilder-dialogs-adaptive/schemas/TriggerConditions/Microsoft.OnError.schema
index ddce686825..950722d963 100644
--- a/libraries/botbuilder-dialogs-adaptive/schemas/TriggerConditions/Microsoft.OnError.schema
+++ b/libraries/botbuilder-dialogs-adaptive/schemas/TriggerConditions/Microsoft.OnError.schema
@@ -3,5 +3,16 @@
     "$role": [ "implements(Microsoft.ITrigger)", "extends(Microsoft.OnCondition)" ],
     "title": "On error",
     "description": "Action to perform when an 'Error' dialog event occurs.",
-    "type": "object"
+    "type": "object",
+    "properties": {
+        "executionLimit": {
+            "$ref": "schema:#/definitions/numberExpression",
+            "title": "Execution limit",
+            "description": "Number of executions allowed for this trigger. Used to break loops in case of errors inside the trigger.",
+            "examples": [
+                3,
+                "=f(x)"
+            ]
+        }
+    }
 }
diff --git a/libraries/botbuilder-dialogs-adaptive/schemas/TriggerConditions/Microsoft.OnError.uischema b/libraries/botbuilder-dialogs-adaptive/schemas/TriggerConditions/Microsoft.OnError.uischema
index 88ae962e39..f6ab4629dc 100644
--- a/libraries/botbuilder-dialogs-adaptive/schemas/TriggerConditions/Microsoft.OnError.uischema
+++ b/libraries/botbuilder-dialogs-adaptive/schemas/TriggerConditions/Microsoft.OnError.uischema
@@ -3,7 +3,8 @@
     "form": {
         "order": [
             "condition",
-            "*"
+            "*",
+            "executionLimit"
         ],
         "hidden": [
             "actions"