diff --git a/vulnerabilities/templates/package_details_v2.html b/vulnerabilities/templates/package_details_v2.html
index e01f5243e..9cc9ea343 100644
--- a/vulnerabilities/templates/package_details_v2.html
+++ b/vulnerabilities/templates/package_details_v2.html
@@ -45,7 +45,7 @@
         <div id="tab-content">
             <div class="tab-div is-active" data-content="essentials">
                 <div class="tab-nested-div mb-1 pb-0">
-                        {% if affected_by_advisories|length != 0 %}
+                        {% if affected_by_advisories_v2|length != 0 %}
                         <div class="pl-3 pr-3 mb-5 floating-purl pb-0">
                             {% else %}
                         <div class="pl-3 pr-3 mb-5 floating-purl pb-2">
@@ -82,7 +82,7 @@
                             </tbody>
                         </table>
                     </div>
-                    {% if affected_by_advisories|length != 0 %}
+                    {% if affected_by_advisories_v2|length != 0 %}
 
                     <div class="pl-3 pr-3 mb-6 non-vuln pb-0">
                         <table class="table vcio-table width-100-pct">
diff --git a/vulnerabilities/views.py b/vulnerabilities/views.py
index 3603b0f60..860bde8eb 100644
--- a/vulnerabilities/views.py
+++ b/vulnerabilities/views.py
@@ -506,15 +506,15 @@ def get_context_data(self, **kwargs):
         epss_data = None
         epss_advisory = None
         if not epss_severity:
-            related_epss_advisory = (
+            epss_advisory = (
                 advisory.related_advisory_severities.filter(
                     datasource_id=EPSSImporterPipeline.pipeline_id
                 )
                 .latest_per_avid()
                 .first()
             )
-            epss_advisory = related_epss_advisory
-            epss_severity = related_epss_advisory.severities.filter(scoring_system="epss").first()
+            if epss_advisory:
+                epss_severity = epss_advisory.severities.filter(scoring_system="epss").first()
         if epss_severity:
             # If the advisory itself does not have EPSS severity, but has a related advisory with EPSS severity, we use the related advisory's EPSS severity and URL as the source of EPSS data.
             epss_data = {