diff --git a/src/views/notifications.html b/src/views/notifications.html
index 32b7db92e..3a9f3873f 100644
--- a/src/views/notifications.html
+++ b/src/views/notifications.html
@@ -27,8 +27,8 @@
           <br/>
           {{ notification.message }}<br/>
           <br/>
-          <h2 ng-show="notification.busyLoadEvent" class="text-center"><i class="fa fa-circle-notch fa-spin"></i></h2>
-          <pre ng-hide="notification.busyLoadEvent" ng-click="$event.stopPropagation();" style="cursor: auto">{{ notification.event.data | json }}</pre>
+          <h2 ng-show="notification.eventId && notification.busyLoadEvent" class="text-center"><i class="fa fa-circle-notch fa-spin"></i></h2>
+          <pre ng-hide="!notification.eventId || notification.busyLoadEvent" ng-click="$event.stopPropagation();" style="cursor: auto">{{ notification.event.data | json }}</pre>
         </div>
       </div>
     </div>
diff --git a/src/views/notifications.js b/src/views/notifications.js
index 9dd3dca6f..ca2c40e5c 100644
--- a/src/views/notifications.js
+++ b/src/views/notifications.js
@@ -69,6 +69,8 @@ angular.module('Application').controller('NotificationsController', ['$scope', '
     };
 
     $scope.notificationExpanding = function (notification) {
+        if (!notification.eventId) return;
+
         notification.busyLoadEvent = true;
 
         Client.getEvent(notification.eventId, function (error, result) {