diff --git a/app/templates/jobs/pre.hbs b/app/templates/jobs/pre.hbs
index 5372bffe..4308e3b4 100644
--- a/app/templates/jobs/pre.hbs
+++ b/app/templates/jobs/pre.hbs
@@ -4,9 +4,19 @@
   {{#if view.job.notStarted}}
     <div class="log-notice">Hang tight, the log cannot be shown until the build has started.</div>
   {{/if}}
+  
+
   {{#if view.job.isLegacyInfrastructure}}
-    <p class="notice"><span class="icon-flag"></span>This job runs on our legacy infrastructure. Read more about upgrading  <a href="http://docs.travis-ci.com/user/migrating-from-legacy/" title="Migrating from legacy">in our docs</a></p>
+    {{#if view.job.isFinished}}
+      <p class="notice"><span class="icon-flag"></span>
+      This job ran on our legacy infrastructure. Please read <a href="http://docs.travis-ci.com/user/migrating-from-legacy/" title="Migrating from legacy">our docs on how to upgrade</a></p>
+    {{else}}
+      <p class="notice"><span class="icon-flag"></span>
+      This job is running on our legacy infrastructure. Please read <a href="http://docs.travis-ci.com/user/migrating-from-legacy/" title="Migrating from legacy">our docs on how to upgrade</a></p>
+    {{/if}}
   {{/if}}
+
+
   <div {{bind-attr class="view.job.notStarted:hidden"}}>
     <menu class="log-header">
       {{#if view.canRemoveLog}}