diff --git a/fec/data/api_caller.py b/fec/data/api_caller.py
index 55dde2befc..02878152a8 100644
--- a/fec/data/api_caller.py
+++ b/fec/data/api_caller.py
@@ -389,12 +389,15 @@ def _get_sorted_documents(ao):
     )
     sorted_documents = sorted(sorted_documents, key=itemgetter("date"), reverse=True)
 
-    # # Sort by document date unless it's a final opinion. Final opinion uses issue date.
-    # sorted_documents = sorted(
-    #     sorted_documents,
-    #     key=lambda doc: doc.get("date") if doc.get("ao_doc_category_id") != 'F' else ao.get("issue_date"),
-    #     reverse=True
-    # )
+    # Sort by document date unless it's a final opinion. Final opinion uses issue date.
+    sorted_documents = sorted(
+        sorted_documents,
+        key=lambda doc: (
+            # Make it blank for null issue_date when ao_doc_category_id is 'F'
+            doc.get("issue_date") or "" if doc.get("ao_doc_category_id") == 'F' else doc.get("date")
+        ),
+        reverse=True
+    )
 
     return sorted_documents
 
diff --git a/fec/data/templatetags/filters.py b/fec/data/templatetags/filters.py
index db7d9be048..ced7d306c7 100644
--- a/fec/data/templatetags/filters.py
+++ b/fec/data/templatetags/filters.py
@@ -139,7 +139,7 @@ def date_filter(value, fmt='%m/%d/%Y'):
 @library.filter
 def ao_document_date(value):
     date = date_filter(value)
-    return 'Not dated' if date == '01/01/1900' else date
+    return '' if date is None else date
 
 
 @library.filter
diff --git a/fec/legal/templates/legal-advisory-opinion.jinja b/fec/legal/templates/legal-advisory-opinion.jinja
index 369f40b6a6..78d1f3eaf1 100644
--- a/fec/legal/templates/legal-advisory-opinion.jinja
+++ b/fec/legal/templates/legal-advisory-opinion.jinja
@@ -43,7 +43,7 @@
           <h2>Documents</h2>
           {% if final_opinion %}
             <div class="content__section">
-              <a class="button button--cta button--document button--lg" href="{{ final_opinion.url }}">Final opinion</a> <span class="t-sans u-padding--left">{{ final_opinion.date | date(fmt='%B %d, %Y') }}</span>
+              <a class="button button--cta button--document button--lg" href="{{ final_opinion.url }}">Final opinion</a>{% if advisory_opinion.issue_date %}<span class="t-sans u-padding--left">{{ advisory_opinion.issue_date | date(fmt='%B %d, %Y') }}</span>{% endif %}
             </div>
           {% endif %}
           <table class="data-table simple-table" style="table-layout: auto;">
@@ -57,7 +57,12 @@
             <tbody>
               {% for document in advisory_opinion.sorted_documents %}
                 <tr>
-                  <td>{{ document.date | ao_document_date }}</td>
+                  <td>
+                  {% if document.ao_doc_category_id == 'F' %}
+                    {{ advisory_opinion.issue_date | ao_document_date }}
+                  {% else %}
+                    {{ document.date | ao_document_date }}
+                  {% endif %}</td>
                   <td><a href="{{ document.url }}">{{ document.description }}</a></td>
                   <td>{{ document.category }}</td>
                 </tr>
diff --git a/fec/legal/templates/partials/legal-search-results-advisory-opinion.jinja b/fec/legal/templates/partials/legal-search-results-advisory-opinion.jinja
index f55cbd2808..b6beb1d36e 100644
--- a/fec/legal/templates/partials/legal-search-results-advisory-opinion.jinja
+++ b/fec/legal/templates/partials/legal-search-results-advisory-opinion.jinja
@@ -30,7 +30,8 @@
               Pending
             {% elif advisory_opinion.status == "Withdrawn"%}
               Withdrawn
-            {% elif advisory_opinion.issue_date != undefined %}
+            {% elif advisory_opinion.issue_date is not none %}
+              {# When issue date is null, leave it blank #}
               {{ advisory_opinion.issue_date | date(fmt='%m/%d/%Y') }}
             {% endif %}
           </div>