diff --git a/ui-ngx/src/app/modules/home/components/edge/edge-downlink-table-config.ts b/ui-ngx/src/app/modules/home/components/edge/edge-downlink-table-config.ts
index 5889ebcdf2..f970ad80f4 100644
--- a/ui-ngx/src/app/modules/home/components/edge/edge-downlink-table-config.ts
+++ b/ui-ngx/src/app/modules/home/components/edge/edge-downlink-table-config.ts
@@ -107,9 +107,15 @@ export class EdgeDownlinkTableConfig extends EntityTableConfig<EdgeEvent, TimePa
     this.columns.push(
       new DateEntityTableColumn<EdgeEvent>('createdTime', 'event.event-time', this.datePipe, '120px'),
       new EntityTableColumn<EdgeEvent>('type', 'event.type', '25%',
-        entity => this.translate.instant(edgeEventTypeTranslations.get(entity.type)), entity => ({}), false),
+        entity => {
+          let key = edgeEventTypeTranslations.get(entity.type);
+          return key ? this.translate.instant(key) : entity.type;
+        }, entity => ({}), false),
       new EntityTableColumn<EdgeEvent>('action', 'edge.event-action', '25%',
-        entity => this.translate.instant(edgeEventActionTypeTranslations.get(entity.action)), entity => ({}), false),
+        entity => {
+          let key = edgeEventActionTypeTranslations.get(entity.action);
+          return key ? this.translate.instant(key) : entity.action;
+        }, entity => ({}), false),
       new EntityTableColumn<EdgeEvent>('entityId', 'edge.entity-id', '40%',
         (entity) => entity.entityId ? entity.entityId : '', () => ({}), false),
       new EntityTableColumn<EdgeEvent>('status', 'event.status', '10%',
diff --git a/ui-ngx/src/app/shared/models/edge.models.ts b/ui-ngx/src/app/shared/models/edge.models.ts
index 372a910402..1acfa2ca28 100644
--- a/ui-ngx/src/app/shared/models/edge.models.ts
+++ b/ui-ngx/src/app/shared/models/edge.models.ts
@@ -59,9 +59,12 @@ export enum EdgeEventType {
   CUSTOMER = 'CUSTOMER',
   RELATION = 'RELATION',
   TENANT = 'TENANT',
+  TENANT_PROFILE = 'TENANT_PROFILE',
   WIDGETS_BUNDLE = 'WIDGETS_BUNDLE',
   WIDGET_TYPE = 'WIDGET_TYPE',
-  ADMIN_SETTINGS = 'ADMIN_SETTINGS'
+  ADMIN_SETTINGS = 'ADMIN_SETTINGS',
+  OTA_PACKAGE = 'OTA_PACKAGE',
+  QUEUE = 'QUEUE'
 }
 
 export enum EdgeEventActionType {
@@ -80,6 +83,8 @@ export enum EdgeEventActionType {
   RPC_CALL = 'RPC_CALL',
   ALARM_ACK = 'ALARM_ACK',
   ALARM_CLEAR = 'ALARM_CLEAR',
+  ALARM_ASSIGNED = 'ALARM_ASSIGNED',
+  ALARM_UNASSIGNED = 'ALARM_UNASSIGNED',
   ASSIGNED_TO_EDGE = 'ASSIGNED_TO_EDGE',
   UNASSIGNED_FROM_EDGE = 'UNASSIGNED_FROM_EDGE',
   CREDENTIALS_REQUEST = 'CREDENTIALS_REQUEST',
@@ -107,9 +112,12 @@ export const edgeEventTypeTranslations = new Map<EdgeEventType, string>(
     [EdgeEventType.CUSTOMER, 'edge-event.type-customer'],
     [EdgeEventType.RELATION, 'edge-event.type-relation'],
     [EdgeEventType.TENANT, 'edge-event.type-tenant'],
+    [EdgeEventType.TENANT_PROFILE, 'edge-event.type-tenant-profile'],
     [EdgeEventType.WIDGETS_BUNDLE, 'edge-event.type-widgets-bundle'],
     [EdgeEventType.WIDGET_TYPE, 'edge-event.type-widgets-type'],
-    [EdgeEventType.ADMIN_SETTINGS, 'edge-event.type-admin-settings']
+    [EdgeEventType.ADMIN_SETTINGS, 'edge-event.type-admin-settings'],
+    [EdgeEventType.OTA_PACKAGE, 'edge-event.type-ota-package'],
+    [EdgeEventType.QUEUE, 'edge-event.type-queue']
   ]
 );
 
@@ -130,6 +138,8 @@ export const edgeEventActionTypeTranslations = new Map<EdgeEventActionType, stri
     [EdgeEventActionType.RPC_CALL, 'edge-event.action-type-rpc-call'],
     [EdgeEventActionType.ALARM_ACK, 'edge-event.action-type-alarm-ack'],
     [EdgeEventActionType.ALARM_CLEAR, 'edge-event.action-type-alarm-clear'],
+    [EdgeEventActionType.ALARM_ASSIGNED, 'edge-event.action-type-alarm-assigned'],
+    [EdgeEventActionType.ALARM_UNASSIGNED, 'edge-event.action-type-alarm-unassigned'],
     [EdgeEventActionType.ASSIGNED_TO_EDGE, 'edge-event.action-type-assigned-to-edge'],
     [EdgeEventActionType.UNASSIGNED_FROM_EDGE, 'edge-event.action-type-unassigned-from-edge'],
     [EdgeEventActionType.CREDENTIALS_REQUEST, 'edge-event.action-type-credentials-request'],
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 f2b2924de4..672ed9b1b2 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -2014,11 +2014,14 @@
         "type-edge": "Edge",
         "type-user": "User",
         "type-tenant": "Tenant",
+        "type-tenant-profile": "Tenant Profile",
         "type-customer": "Customer",
         "type-relation": "Relation",
         "type-widgets-bundle": "Widgets Bundle",
         "type-widgets-type": "Widgets Type",
         "type-admin-settings": "Admin Settings",
+        "type-ota-package": "Ota Package",
+        "type-queue": "Queue",
         "action-type-added": "Added",
         "action-type-deleted": "Deleted",
         "action-type-updated": "Updated",
@@ -2034,6 +2037,8 @@
         "action-type-rpc-call": "RPC Call",
         "action-type-alarm-ack": "Alarm Ack",
         "action-type-alarm-clear": "Alarm Clear",
+        "action-type-alarm-assigned": "Alarm Assigned",
+        "action-type-alarm-unassigned": "Alarm Unassigned",
         "action-type-assigned-to-edge": "Assigned to Edge",
         "action-type-unassigned-from-edge": "Unassigned from Edge",
         "action-type-credentials-request": "Credentials Request",