diff --git a/lms/templates/design-templates/live-blocks/dashboard-course-listing/_dashboard-course-listing-01.html b/lms/templates/design-templates/live-blocks/dashboard-course-listing/_dashboard-course-listing-01.html
index e18b6745..112a71df 100644
--- a/lms/templates/design-templates/live-blocks/dashboard-course-listing/_dashboard-course-listing-01.html
+++ b/lms/templates/design-templates/live-blocks/dashboard-course-listing/_dashboard-course-listing-01.html
@@ -297,8 +297,10 @@ <h4 class="a--dashboard-course-listing-01__course-organisation-id">
         </ul>
       </div>
       % endif
-
-      % if course_overview.may_certify() and cert_status:
+      
+      ## TODO: The below change to logic may not work in Ginkgo and onward due to refactoring.  
+      ## Ask Bryan W. (bryanlandia) if you have merge problems.
+      % if course_overview.may_certify() and cert_status and cert_status.get('status', None) != 'unavailable':
         <%include file='/dashboard/_dashboard_certificate_information.html' args='cert_status=cert_status,course_overview=course_overview, enrollment=enrollment, reverify_link=reverify_link'/>
       % endif