diff --git a/src/js/app/challenge-details/js/controllers/challenge-details-controller.js b/src/js/app/challenge-details/js/controllers/challenge-details-controller.js
index 0cbdef8e..ce7de178 100644
--- a/src/js/app/challenge-details/js/controllers/challenge-details-controller.js
+++ b/src/js/app/challenge-details/js/controllers/challenge-details-controller.js
@@ -275,8 +275,7 @@
     challengeName = challenge.challengeName;
     var reviewScorecardId = challenge.reviewScorecardId;
     vm.isDesign = (challengeType === 'design');
-    vm.allowDownloads = challenge.currentPhaseName === 'Registration' || challenge.currentPhaseName === 'Submission';
-
+    vm.allowDownloads = challenge.currentStatus === 'Active' && challenge.currentPhaseRemainingTime > 0;
 
     if ((challenge.currentPhaseName != 'Stalled' && challenge.checkpointSubmissionEndDate && challenge.checkpointSubmissionEndDate != '') || (challenge.checkpoints && challenge.checkpoints.length > 0)) {
       ChallengeService
diff --git a/src/js/app/challenge-details/partials/ng-content-challenge-downloads.tpl.html b/src/js/app/challenge-details/partials/ng-content-challenge-downloads.tpl.html
index 4944c974..a4941ba8 100644
--- a/src/js/app/challenge-details/partials/ng-content-challenge-downloads.tpl.html
+++ b/src/js/app/challenge-details/partials/ng-content-challenge-downloads.tpl.html
@@ -1,20 +1,20 @@
 <h3>Downloads:</h3>
 <div class="inner">
   <ul class="downloadDocumentList">
-    <li ng-if="CD.challenge.Documents && CD.challenge.Documents.length > 0 && CD.allowDownloads && CD.allowDownloads" ng-repeat="document in CD.challenge.Documents">
+    <li ng-if="CD.challenge.Documents.length && CD.allowDownloads && CD.isRegistered" ng-repeat="document in CD.challenge.Documents">
       <a ng-href="{{document.url}}">{{document.documentName}}</a>
     </li>
-    <li ng-if="CD.challenge.Documents && CD.challenge.Documents.length === 0 && CD.allowDownloads">
-      <strong>None</strong>
+    <li ng-if="CD.challenge.Documents.length && CD.allowDownloads && CD.isLoggedIn && !CD.isRegistered">
+      <strong>Register to Download Files</strong>
     </li>
-    <li ng-if="!CD.allowDownloads">
-      <strong>Downloads are no longer available for this challenge</strong>
+    <li ng-if="CD.challenge.Documents.length && CD.allowDownloads && !CD.isLoggedIn">
+      <strong>Log In and Register to Download Files</strong>
     </li>
-    <li ng-if="!CD.challenge.Documents && CD.allowDownloads && CD.isLoggedIn && !CD.isRegistered">
-      <strong>Register to Download Files (if available)</strong>
+    <li ng-if="CD.challenge.Documents.length && !CD.allowDownloads">
+      <strong>Downloads are not available for this challenge</strong>
     </li>
-    <li ng-if="!CD.challenge.Documents && CD.allowDownloads && !CD.isLoggedIn">
-      <strong>Log In and Register to Download Files <br>(if available)</strong>
+    <li ng-if="!CD.challenge.Documents.length">
+      <strong>None</strong>
     </li>
   </ul>
 </div>