diff --git a/services/web/public/src/filters/formatDate.js b/services/web/public/src/filters/formatDate.js
index b50b0a6a2a..0ac8a53a38 100644
--- a/services/web/public/src/filters/formatDate.js
+++ b/services/web/public/src/filters/formatDate.js
@@ -25,6 +25,7 @@ define(['base', 'moment'], function(App, moment) {
     'formatDate',
     () =>
       function(date, format) {
+        if (!date) return 'N/A'
         if (format == null) {
           format = 'Do MMM YYYY, h:mm a'
         }
@@ -34,5 +35,5 @@ define(['base', 'moment'], function(App, moment) {
 
   App.filter('relativeDate', () => date => moment(date).calendar())
 
-  return App.filter('fromNowDate', () => date => moment(date).fromNow())
+  App.filter('fromNowDate', () => date => moment(date).fromNow())
 })