diff --git a/ui/src/app/event/event-row-edge-event.tpl.html b/ui/src/app/event/event-row-edge-event.tpl.html
index 6cc06d0cc3..e8773d34ca 100644
--- a/ui/src/app/event/event-row-edge-event.tpl.html
+++ b/ui/src/app/event/event-row-edge-event.tpl.html
@@ -19,7 +19,7 @@
 <div class="tb-cell" flex="20">{{ event.type }}</div>
 <div class="tb-cell" flex="40">{{ event.action }}</div>
 <div class="tb-cell" flex="20">{{ event.entityId }}</div>
-<div class="tb-cell" flex="15" ng-style="isPending ? {'color': 'rgba(0, 0, 0, .38)'} : {'color': '#000'}">{{ updateStatus(event.createdTime) | translate }}</div>
+<div class="tb-cell" flex="15" ng-style="{'color': statusColor}">{{ updateStatus(event.createdTime) | translate }}</div>
 <div class="tb-cell" flex="10">
     <md-button ng-if="checkEdgeEventType(event.type)" class="md-icon-button md-primary"
                ng-click="showEdgeEntityContent($event, 'edge.entity-info', 'JSON')"
diff --git a/ui/src/app/event/event-row.directive.js b/ui/src/app/event/event-row.directive.js
index 39f3f46622..817b2456ab 100644
--- a/ui/src/app/event/event-row.directive.js
+++ b/ui/src/app/event/event-row.directive.js
@@ -167,17 +167,15 @@ export default function EventRowDirective($compile, $templateCache, $mdDialog, $
         $compile(element.contents())(scope);
 
         scope.updateStatus = function(eventCreatedTime) {
-            if (scope.queueStartTs) {
-                var status;
-                if (eventCreatedTime < scope.queueStartTs) {
-                    status = $translate.instant('edge.success');
-                    scope.isPending = false;
-                } else {
-                    status = $translate.instant('edge.failed');
-                    scope.isPending = true;
-                }
-                return status;
+            var status;
+            if (eventCreatedTime < scope.queueStartTs) {
+                status = $translate.instant('edge.success');
+                scope.statusColor = '#000';
+            } else {
+                status = $translate.instant('edge.failed');
+                scope.statusColor = 'rgba(0, 0, 0, .38)';
             }
+            return status;
         }
     }
 
diff --git a/ui/src/app/event/event-table.directive.js b/ui/src/app/event/event-table.directive.js
index 762d4f308d..746f82c405 100644
--- a/ui/src/app/event/event-table.directive.js
+++ b/ui/src/app/event/event-table.directive.js
@@ -220,7 +220,6 @@ export default function EventTableDirective($compile, $templateCache, $rootScope
         }
 
         scope.subscriptionId = null;
-        scope.queueStartTs = 0;
 
         scope.loadEdgeInfo = function() {
             attributeService.getEntityAttributesValues(
@@ -228,11 +227,10 @@ export default function EventTableDirective($compile, $templateCache, $rootScope
                 scope.entityId,
                 types.attributesScope.server.value,
                 types.edgeAttributeKeys.queueStartTs,
-                {})
-                .then(function success(attributes) {
-                    scope.onEdgeAttributesUpdate(attributes);
-                });
-
+                null).then(
+                    function success(attributes) {
+                        attributes.length > 0 ? scope.onEdgeAttributesUpdate(attributes) : scope.queueStartTs = 0;
+                    });
             scope.checkSubscription();
         }