diff --git a/static/directives/triggered-build-description.html b/static/directives/triggered-build-description.html
index 50199a292..39c0f3585 100644
--- a/static/directives/triggered-build-description.html
+++ b/static/directives/triggered-build-description.html
@@ -38,13 +38,14 @@
         </span>
       </div>
       <div class="commit-information">
-        <span class="commit-who-when">
+        <span class="commit-who-when" ng-if="build.trigger_metadata.commit_info.date || build.trigger_metadata.commit_info.author">
           Authored
-          <time-ago datetime="build.trigger_metadata.commit_info.date"></time-ago>
+          <time-ago datetime="build.trigger_metadata.commit_info.date" ng-if="build.trigger_metadata.commit_info.date"></time-ago>
           <span class="anchor commit-who"
                 href="{{ build.trigger_metadata.commit_info.author.url }}"
                 is-only-text="!build.trigger_metadata.commit_info.author.url"
-                ng-safenewtab>
+                ng-safenewtab
+                ng-if="build.trigger_metadata.commit_info.author">
             <img ng-src="{{ build.trigger_metadata.commit_info.author.avatar_url }}"
                  ng-if="build.trigger_metadata.commit_info.author.avatar_url">
             {{ build.trigger_metadata.commit_info.author.username }}