diff --git a/.run/[CE Edge] Server.run.xml b/.run/[CE Edge] Server.run.xml
index 67edc48d1f..89667da5db 100644
--- a/.run/[CE Edge] Server.run.xml	
+++ b/.run/[CE Edge] Server.run.xml	
@@ -5,6 +5,7 @@
       <env name="EDGES_RPC_PORT" value="7070" />
       <env name="COAP_ENABLED" value="true" />
       <env name="EDGES_RPC_ENABLED" value="true" />
+      <env name="MQTT_BIND_PORT" value="1884" />
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.thingsboard.server.ThingsboardServerApplication" />
     <module name="application" />
diff --git a/ui-ngx/src/app/modules/home/components/event/event-table-config.ts b/ui-ngx/src/app/modules/home/components/event/event-table-config.ts
index 297214ca96..1472f71f27 100644
--- a/ui-ngx/src/app/modules/home/components/event/event-table-config.ts
+++ b/ui-ngx/src/app/modules/home/components/event/event-table-config.ts
@@ -28,7 +28,7 @@ import {MatDialog} from '@angular/material/dialog';
 import {EntityId} from '@shared/models/id/entity-id';
 import {EventService} from '@app/core/http/event.service';
 import {EventTableHeaderComponent} from '@home/components/event/event-table-header.component';
-import {EntityTypeResource} from '@shared/models/entity-type.models';
+import {EntityType, EntityTypeResource} from '@shared/models/entity-type.models';
 import {Observable} from 'rxjs';
 import {PageData} from '@shared/models/page/page-data';
 import {Direction} from '@shared/models/page/sort-order';
@@ -81,6 +81,10 @@ export class EventTableConfig extends EntityTableConfig<Event, TimePageLink> {
 
     this.eventTypes = Object.keys(EventType).map(type => EventType[type]);
 
+    if (this.entityId.entityType !== EntityType.EDGE) {
+      this.eventTypes.pop();
+    }
+
     if (disabledEventTypes && disabledEventTypes.length) {
       this.eventTypes = this.eventTypes.filter(type => disabledEventTypes.indexOf(type) === -1);
     }