diff --git a/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/EdgeConnectivityTriggerProcessor.java b/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/EdgeConnectivityTriggerProcessor.java
index 7133bd2d76..b5418f6abb 100644
--- a/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/EdgeConnectivityTriggerProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/EdgeConnectivityTriggerProcessor.java
@@ -32,7 +32,7 @@ public class EdgeConnectivityTriggerProcessor implements NotificationRuleTrigger
     @Override
     public boolean matchesFilter(EdgeConnectivityTrigger trigger, EdgeConnectivityNotificationRuleTriggerConfig triggerConfig) {
         EdgeConnectivityEvent event = trigger.isConnected() ? EdgeConnectivityEvent.CONNECTED : EdgeConnectivityEvent.DISCONNECTED;
-        if (!triggerConfig.getNotifyOn().contains(event)) {
+        if (CollectionUtils.isEmpty(triggerConfig.getNotifyOn()) || !triggerConfig.getNotifyOn().contains(event)) {
             return false;
         }
         if (CollectionUtils.isNotEmpty(triggerConfig.getEdges())) {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EdgeConnectivityNotificationRuleTriggerConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EdgeConnectivityNotificationRuleTriggerConfig.java
index bf22487614..e79f9b0968 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EdgeConnectivityNotificationRuleTriggerConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EdgeConnectivityNotificationRuleTriggerConfig.java
@@ -31,7 +31,6 @@ import java.util.UUID;
 public class EdgeConnectivityNotificationRuleTriggerConfig implements NotificationRuleTriggerConfig {
 
     private Set<UUID> edges; // if empty - all edges
-    @NotEmpty
     private Set<EdgeConnectivityEvent> notifyOn;
 
     @Override
diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html
index 4c309f5e80..867cd74f3b 100644
--- a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html
+++ b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html
@@ -523,7 +523,7 @@
         </mat-panel-description>
       </mat-expansion-panel-header>
       <ng-template matExpansionPanelContent>
-        <div fxFlex fxLayout="row"  fxLayout.xs="column" fxLayoutGap.gt-xs="16px">
+        <div fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutGap.gt-xs="16px">
           <tb-rate-limits fxFlex formControlName="transportTenantTelemetryDataPointsRateLimit"
                           [type]="rateLimitsType.TENANT_TELEMETRY_DATA_POINTS">
           </tb-rate-limits>
@@ -531,7 +531,7 @@
                           [type]="rateLimitsType.DEVICE_TELEMETRY_DATA_POINTS">
           </tb-rate-limits>
         </div>
-        <div fxFlex fxLayout="row"  fxLayout.xs="column" fxLayoutGap.gt-xs="16px">
+        <div fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutGap.gt-xs="16px">
           <tb-rate-limits fxFlex formControlName="tenantServerRestLimitsConfiguration"
                           [type]="rateLimitsType.TENANT_SERVER_REST_LIMITS_CONFIGURATION">
           </tb-rate-limits>
@@ -539,7 +539,7 @@
                           [type]="rateLimitsType.CUSTOMER_SERVER_REST_LIMITS_CONFIGURATION">
           </tb-rate-limits>
         </div>
-        <div fxFlex fxLayout="row"  fxLayout.xs="column" fxLayoutGap.gt-xs="16px">
+        <div fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutGap.gt-xs="16px">
           <tb-rate-limits fxFlex formControlName="tenantEntityExportRateLimit"
                           [type]="rateLimitsType.TENANT_ENTITY_EXPORT_RATE_LIMIT">
           </tb-rate-limits>
@@ -547,7 +547,7 @@
                           [type]="rateLimitsType.TENANT_ENTITY_IMPORT_RATE_LIMIT">
           </tb-rate-limits>
         </div>
-        <div fxFlex fxLayout="row"  fxLayout.xs="column" fxLayoutGap.gt-xs="16px">
+        <div fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutGap.gt-xs="16px">
           <tb-rate-limits fxFlex formControlName="wsUpdatesPerSessionRateLimit"
                           [type]="rateLimitsType.WS_UPDATE_PER_SESSION_RATE_LIMIT">
           </tb-rate-limits>
@@ -555,7 +555,7 @@
                           [type]="rateLimitsType.CASSANDRA_QUERY_TENANT_RATE_LIMITS_CONFIGURATION">
           </tb-rate-limits>
         </div>
-        <div fxFlex fxLayout="row"  fxLayout.xs="column" fxLayoutGap.gt-xs="16px">
+        <div fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutGap.gt-xs="16px">
           <tb-rate-limits fxFlex="50" formControlName="tenantNotificationRequestsRateLimit"
                           [type]="rateLimitsType.TENANT_NOTIFICATION_REQUEST_RATE_LIMIT">
           </tb-rate-limits>
@@ -563,6 +563,14 @@
                           [type]="rateLimitsType.TENANT_NOTIFICATION_REQUESTS_PER_RULE_RATE_LIMIT">
           </tb-rate-limits>
         </div>
+        <div fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutGap.gt-xs="16px">
+          <tb-rate-limits fxFlex="50" formControlName="edgeEventRateLimits"
+                          [type]="rateLimitsType.EDGE_EVENTS_RATE_LIMIT">
+          </tb-rate-limits>
+          <tb-rate-limits fxFlex="50" formControlName="edgeEventRateLimitsPerEdge"
+                          [type]="rateLimitsType.EDGE_EVENTS_PER_EDGE_RATE_LIMIT">
+          </tb-rate-limits>
+        </div>
       </ng-template>
     </mat-expansion-panel>
   </fieldset>
diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts
index a0b8770509..0c95324d85 100644
--- a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts
+++ b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts
@@ -106,7 +106,9 @@ export class DefaultTenantProfileConfigurationComponent implements ControlValueA
       maxWsSubscriptionsPerRegularUser: [null, [Validators.min(0)]],
       maxWsSubscriptionsPerPublicUser: [null, [Validators.min(0)]],
       wsUpdatesPerSessionRateLimit: [null, []],
-      cassandraQueryTenantRateLimitsConfiguration: [null, []]
+      cassandraQueryTenantRateLimitsConfiguration: [null, []],
+      edgeEventRateLimits: [null, []],
+      edgeEventRateLimitsPerEdge: [null, []]
     });
 
     this.defaultTenantProfileConfigurationFormGroup.get('smsEnabled').valueChanges.pipe(
diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits.models.ts b/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits.models.ts
index 257752f5f4..8924682aa1 100644
--- a/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits.models.ts
+++ b/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits.models.ts
@@ -35,7 +35,9 @@ export enum RateLimitsType {
   TENANT_ENTITY_EXPORT_RATE_LIMIT = 'TENANT_ENTITY_EXPORT_RATE_LIMIT',
   TENANT_ENTITY_IMPORT_RATE_LIMIT = 'TENANT_ENTITY_IMPORT_RATE_LIMIT',
   TENANT_NOTIFICATION_REQUEST_RATE_LIMIT = 'TENANT_NOTIFICATION_REQUEST_RATE_LIMIT',
-  TENANT_NOTIFICATION_REQUESTS_PER_RULE_RATE_LIMIT = 'TENANT_NOTIFICATION_REQUESTS_PER_RULE_RATE_LIMIT'
+  TENANT_NOTIFICATION_REQUESTS_PER_RULE_RATE_LIMIT = 'TENANT_NOTIFICATION_REQUESTS_PER_RULE_RATE_LIMIT',
+  EDGE_EVENTS_RATE_LIMIT = 'EDGE_EVENTS_RATE_LIMIT',
+  EDGE_EVENTS_PER_EDGE_RATE_LIMIT = 'EDGE_EVENTS_PER_EDGE_RATE_LIMIT'
 }
 
 export const rateLimitsLabelTranslationMap = new Map<RateLimitsType, string>(
@@ -54,6 +56,8 @@ export const rateLimitsLabelTranslationMap = new Map<RateLimitsType, string>(
     [RateLimitsType.TENANT_ENTITY_IMPORT_RATE_LIMIT, 'tenant-profile.tenant-entity-import-rate-limit'],
     [RateLimitsType.TENANT_NOTIFICATION_REQUEST_RATE_LIMIT, 'tenant-profile.tenant-notification-request-rate-limit'],
     [RateLimitsType.TENANT_NOTIFICATION_REQUESTS_PER_RULE_RATE_LIMIT, 'tenant-profile.tenant-notification-requests-per-rule-rate-limit'],
+    [RateLimitsType.EDGE_EVENTS_RATE_LIMIT, 'tenant-profile.rate-limits.edge-events-rate-limit'],
+    [RateLimitsType.EDGE_EVENTS_PER_EDGE_RATE_LIMIT, 'tenant-profile.rate-limits.edge-events-per-edge-rate-limit'],
   ]
 );
 
@@ -73,6 +77,8 @@ export const rateLimitsDialogTitleTranslationMap = new Map<RateLimitsType, strin
     [RateLimitsType.TENANT_ENTITY_IMPORT_RATE_LIMIT, 'tenant-profile.rate-limits.edit-tenant-entity-import-rate-limit-title'],
     [RateLimitsType.TENANT_NOTIFICATION_REQUEST_RATE_LIMIT, 'tenant-profile.rate-limits.edit-tenant-notification-request-rate-limit-title'],
     [RateLimitsType.TENANT_NOTIFICATION_REQUESTS_PER_RULE_RATE_LIMIT, 'tenant-profile.rate-limits.edit-tenant-notification-requests-per-rule-rate-limit-title'],
+    [RateLimitsType.EDGE_EVENTS_RATE_LIMIT, 'tenant-profile.rate-limits.edit-edge-events-rate-limit'],
+    [RateLimitsType.EDGE_EVENTS_PER_EDGE_RATE_LIMIT, 'tenant-profile.rate-limits.edit-edge-events-per-edge-rate-limit'],
   ]
 );
 
diff --git a/ui-ngx/src/app/modules/home/pages/notification/rule/rule-notification-dialog.component.html b/ui-ngx/src/app/modules/home/pages/notification/rule/rule-notification-dialog.component.html
index ff2bae3a26..852cb7a549 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/rule/rule-notification-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/pages/notification/rule/rule-notification-dialog.component.html
@@ -407,44 +407,58 @@
         </section>
       </form>
     </mat-step>
-    <mat-step [stepControl]="edgeTemplateForm"
-              *ngIf="ruleNotificationForm.get('triggerType').value === triggerType.EDGE_FAILURE">
+
+    <mat-step [stepControl]="edgeConnectivityTemplateForm"
+              *ngIf="ruleNotificationForm.get('triggerType').value === triggerType.EDGE_CONNECTIVITY">
       <ng-template matStepLabel>{{ 'notification.edge-trigger-settings' | translate }}</ng-template>
-      <form [formGroup]="edgeTemplateForm">
+      <form [formGroup]="edgeConnectivityTemplateForm">
         <section formGroupName="triggerConfig">
           <fieldset class="fields-group tb-margin-before-field">
             <legend translate>notification.filter</legend>
-            <tb-string-items-list
-              editable
-              label="{{ 'alarm.alarm-type-list' | translate }}"
-              placeholder="{{ !alarmTemplateForm.get('triggerConfig.alarmTypes').value?.length ? ('alarm.any-type' | translate) : '' }}"
-              floatLabel="always"
-              formControlName="alarmTypes">
-            </tb-string-items-list>
-
+            <tb-entity-list
+              formControlName="edges"
+              subscriptSizing="dynamic"
+              labelText="{{'edge.edge-instances' | translate}}"
+              placeholderText="{{ 'edge.edge-instances' | translate }}"
+              hint="{{ 'notification.edge-list-rule-hint' | translate }}"
+              [entityType]="entityType.EDGE">
+            </tb-entity-list>
             <mat-form-field fxFlex class="mat-block" floatLabel="always">
-              <mat-label translate>alarm.alarm-severity-list</mat-label>
-              <mat-select formControlName="alarmSeverities" multiple
-                          placeholder="{{ !alarmTemplateForm.get('triggerConfig.alarmSeverities').value?.length ? ('alarm.any-severity' | translate) : '' }}">
-                <mat-option *ngFor="let alarmSeverity of alarmSeverities" [value]="alarmSeverity">
-                  {{ alarmSeverityTranslationMap.get(alarmSeverity) | translate }}
+              <mat-label translate>notification.notify-on</mat-label>
+              <mat-select formControlName="notifyOn" multiple
+                          placeholder="{{ !edgeConnectivityTemplateForm.get('triggerConfig.notifyOn').value?.length ? ('event.all-events' | translate) : '' }}">
+                <mat-option *ngFor="let edgeEvent of edgeConnectivityEvents" [value]="edgeEvent">
+                  {{ edgeConnectivityEventTranslationMap.get(edgeEvent) | translate }}
                 </mat-option>
               </mat-select>
             </mat-form-field>
           </fieldset>
-          <mat-form-field fxFlex class="mat-block">
-            <mat-label translate>notification.notify-on</mat-label>
-            <mat-select formControlName="notifyOn" multiple>
-              <mat-option *ngFor="let alarmAction of alarmActions" [value]="alarmAction">
-                {{ alarmActionTranslationMap.get(alarmAction) | translate }}
-              </mat-option>
-            </mat-select>
-            <mat-error *ngIf="alarmTemplateForm.get('triggerConfig.notifyOn').hasError('required')">
-              {{ 'notification.notify-on-required' | translate }}
-            </mat-error>
+        </section>
+      </form>
+      <form [formGroup]="ruleNotificationForm">
+        <section formGroupName="additionalConfig">
+          <mat-form-field class="mat-block">
+            <mat-label translate>notification.description</mat-label>
+            <input matInput formControlName="description">
           </mat-form-field>
         </section>
       </form>
+    </mat-step>
+
+    <mat-step [stepControl]="edgeFailureTemplateForm"
+              *ngIf="ruleNotificationForm.get('triggerType').value === triggerType.EDGE_FAILURE">
+      <ng-template matStepLabel>{{ 'notification.edge-trigger-settings' | translate }}</ng-template>
+      <form [formGroup]="edgeFailureTemplateForm">
+        <section formGroupName="triggerConfig">
+          <fieldset class="fields-group tb-margin-before-field">
+            <legend translate>notification.filter</legend>
+            <tb-entity-list labelText="{{'edge.edge-instances' | translate}}"
+                            [entityType]="entityType.EDGE"
+                            formControlName="edges">
+            </tb-entity-list>
+          </fieldset>
+        </section>
+      </form>
       <form [formGroup]="ruleNotificationForm">
         <section formGroupName="additionalConfig">
           <mat-form-field class="mat-block">
diff --git a/ui-ngx/src/app/modules/home/pages/notification/rule/rule-notification-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/notification/rule/rule-notification-dialog.component.ts
index a0569e5359..099897af7c 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/rule/rule-notification-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/notification/rule/rule-notification-dialog.component.ts
@@ -68,6 +68,7 @@ import {
 } from '@shared/models/api-usage.models';
 import { LimitedApi, LimitedApiTranslationMap } from '@shared/models/limited-api.models';
 import { StringItemsOption } from '@shared/components/string-items-list.component';
+import { EdgeConnectivityEvent, EdgeConnectivityEventTranslationMap } from '@shared/models/edge.models';
 
 export interface RuleNotificationDialogData {
   rule?: NotificationRule;
@@ -98,7 +99,8 @@ export class RuleNotificationDialogComponent extends
   apiUsageLimitTemplateForm: FormGroup;
   newPlatformVersionTemplateForm: FormGroup;
   rateLimitsTemplateForm: FormGroup;
-  edgeTemplateForm: FormGroup;
+  edgeFailureTemplateForm: FormGroup;
+  edgeConnectivityTemplateForm: FormGroup;
 
   triggerType = TriggerType;
   triggerTypes: TriggerType[];
@@ -133,6 +135,9 @@ export class RuleNotificationDialogComponent extends
   apiFeatures: ApiFeature[] = Object.values(ApiFeature);
   apiFeatureTranslationMap = ApiFeatureTranslationMap;
 
+  edgeConnectivityEvents: EdgeConnectivityEvent[] = Object.values(EdgeConnectivityEvent);
+  edgeConnectivityEventTranslationMap = EdgeConnectivityEventTranslationMap;
+
   limitedApis: StringItemsOption[];
 
   entityType = EntityType;
@@ -222,11 +227,18 @@ export class RuleNotificationDialogComponent extends
       }
     });
 
-    this.edgeTemplateForm = this.fb.group({
+    this.edgeConnectivityTemplateForm = this.fb.group({
       triggerConfig: this.fb.group({
+        edges: [null],
+        notifyOn: [null]
       })
-      }
-    );
+    });
+
+    this.edgeFailureTemplateForm = this.fb.group({
+      triggerConfig: this.fb.group({
+        edges: [null]
+      })
+    });
 
     this.alarmTemplateForm = this.fb.group({
       triggerConfig: this.fb.group({
@@ -335,7 +347,9 @@ export class RuleNotificationDialogComponent extends
       [TriggerType.ENTITIES_LIMIT, this.entitiesLimitTemplateForm],
       [TriggerType.API_USAGE_LIMIT, this.apiUsageLimitTemplateForm],
       [TriggerType.NEW_PLATFORM_VERSION, this.newPlatformVersionTemplateForm],
-      [TriggerType.RATE_LIMITS, this.rateLimitsTemplateForm]
+      [TriggerType.RATE_LIMITS, this.rateLimitsTemplateForm],
+      [TriggerType.EDGE_FAILURE, this.edgeFailureTemplateForm],
+      [TriggerType.EDGE_CONNECTIVITY, this.edgeConnectivityTemplateForm]
     ]);
 
     if (data.isAdd || data.isCopy) {
diff --git a/ui-ngx/src/app/shared/models/edge.models.ts b/ui-ngx/src/app/shared/models/edge.models.ts
index 7187dc8eaa..4da5f089a0 100644
--- a/ui-ngx/src/app/shared/models/edge.models.ts
+++ b/ui-ngx/src/app/shared/models/edge.models.ts
@@ -190,3 +190,15 @@ export enum EdgeInstructionsMethod {
 }
 
 export const edgeVersionAttributeKey = 'edgeVersion';
+
+export enum EdgeConnectivityEvent {
+  CONNECTED= 'CONNECTED',
+  DISCONNECTED = 'DISCONNECTED'
+}
+
+export const EdgeConnectivityEventTranslationMap = new Map<EdgeConnectivityEvent, string>(
+  [
+    [EdgeConnectivityEvent.CONNECTED, 'edge-event.connected'],
+    [EdgeConnectivityEvent.DISCONNECTED, 'edge-event.disconnected']
+  ]
+);
diff --git a/ui-ngx/src/assets/help/en_US/notification/edge_connected.md b/ui-ngx/src/assets/help/en_US/notification/edge_connectivity.md
similarity index 100%
rename from ui-ngx/src/assets/help/en_US/notification/edge_connected.md
rename to ui-ngx/src/assets/help/en_US/notification/edge_connectivity.md
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index df0bb635cd..63b791a6ef 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -2073,7 +2073,9 @@
         "action-type-assigned-to-edge": "Assigned to Edge",
         "action-type-unassigned-from-edge": "Unassigned from Edge",
         "action-type-credentials-request": "Credentials Request",
-        "action-type-entity-merge-request": "Entity Merge Request"
+        "action-type-entity-merge-request": "Entity Merge Request",
+        "connected": "Connected",
+        "disconnected": "Disconnected"
     },
     "error": {
         "unable-to-connect": "Unable to connect to the server! Please check your internet connection.",
@@ -3282,6 +3284,7 @@
         "device-profiles-list-rule-hint": "If the field is empty, the trigger will be applied to all device profiles",
         "disabled": "Disabled",
         "edge-trigger-settings": "Edge trigger settings",
+        "edge-list-rule-hint": "If the field is empty, the trigger will be applied to all edge instances",
         "edit-notification-recipients-group": "Edit notification recipients group",
         "edit-notification-template": "Edit notification template",
         "edit-rule": "Edit rule",
@@ -3427,7 +3430,8 @@
             "rule-node": "Rule node",
             "new-platform-version": "New platform version",
             "rate-limits": "Exceeded rate limits",
-            "edge": "Edge"
+            "edge-failure": "Edge error",
+            "edge-connectivity": "Edge connectivity"
         },
         "templates": "Templates",
         "notification-templates": "Notifications / Templates",
@@ -4173,6 +4177,10 @@
             "edit-tenant-entity-import-rate-limit-title": "Edit entity version load rate limits",
             "edit-tenant-notification-request-rate-limit-title": "Edit notification requests rate limits",
             "edit-tenant-notification-requests-per-rule-rate-limit-title": "Edit notification requests per notification rule rate limits",
+            "edit-edge-events-rate-limit": "Edit edge events rate limits",
+            "edit-edge-events-per-edge-rate-limit": "Edit edge events per edge rate limits",
+            "edge-events-rate-limit": "Edge events",
+            "edge-events-per-edge-rate-limit": "Edge events per edge",
             "messages-per": "messages per",
             "not-set": "Not set",
             "number-of-messages": "Number of messages",