diff --git a/app/controllers/Statistics.scala b/app/controllers/Statistics.scala
index 174118d..984ccd5 100644
--- a/app/controllers/Statistics.scala
+++ b/app/controllers/Statistics.scala
@@ -6,7 +6,7 @@ import com.google.inject.name.Named
 import com.ysoft.odc.statistics.{LibDepStatistics, TagStatistics}
 import com.ysoft.odc.{ArtifactFile, ArtifactItem}
 import controllers.DependencyCheckReportsParser.ResultWithSelection
-import models.LibraryTag
+import models.{ExportedVulnerability, LibraryTag}
 import org.joda.time.DateTime
 import play.api.i18n.MessagesApi
 import play.twirl.api.Txt
@@ -146,6 +146,13 @@ class Statistics @Inject() (
   }
 
   def vulnerability(name: String, selectorOption: Option[String]) = ReadAction.async { implicit req =>
+    val ticketOptionFuture = vulnerabilityNotificationService.issueTrackerExport.ticketForVulnerability(name)
+    val issueOptionFuture = ticketOptionFuture.map(ticketOption =>
+      for{
+        ticket <- ticketOption
+        issueTrackerService <- issueTrackerServiceOption
+      } yield ticket -> issueTrackerService.ticketLink(ticket)
+    )
     val (lastRefreshTime, resultsFuture) = projectReportsProvider.resultsForVersions(versions)
     resultsFuture flatMap { allResults =>
       select(allResults, selectorOption).fold(Future.successful(notFound())){ selection =>
@@ -158,16 +165,18 @@ class Statistics @Inject() (
         vulns.get(name).fold{
           for{
             vulnOption <- odcService.getVulnerabilityDetails(name)
+            issueOption <- issueOptionFuture
           } yield Ok(views.html.statistics.vulnerabilityNotFound( // TODO: the not found page might be replaced by some page explaining that there is no project affected by that vulnerability
             name = name,
             projectsWithSelection = selection.projectsWithSelection,
-            failedProjects = selection.result.failedProjects
+            failedProjects = selection.result.failedProjects,
+            issueOption = issueOption
           ))
         }{ vulnerableDependencies =>
           for {
             vulnOption <- odcService.getVulnerabilityDetails(name)
             plainLibs <- librariesService.byPlainLibraryIdentifiers(vulnerableDependencies.flatMap(_.plainLibraryIdentifiers)).map(_.keySet)
-            ticketOption <- vulnerabilityNotificationService.issueTrackerExport.ticketForVulnerability(name)
+            issueOption <- issueOptionFuture
           } yield vulnOption.fold{
             sys.error("The vulnerability is not in the database, you seem to have outdated the local vulnerability database") // TODO: consider fallback or more friendly error message
           }{vuln => Ok(views.html.statistics.vulnerability(
@@ -177,10 +186,7 @@ class Statistics @Inject() (
             vulnerableDependencies = vulnerableDependencies,
             affectedLibraries = plainLibs,
             projectsWithSelection = selection.projectsWithSelection,
-            issueOption = for{
-              ticket <- ticketOption
-              issueTrackerService <- issueTrackerServiceOption
-            } yield ticket -> issueTrackerService.ticketLink(ticket)
+            issueOption = issueOption
           ))}
         }
 
diff --git a/app/views/statistics/vulnerabilityNotFound.scala.html b/app/views/statistics/vulnerabilityNotFound.scala.html
index ffbcaf6..b33061d 100644
--- a/app/views/statistics/vulnerabilityNotFound.scala.html
+++ b/app/views/statistics/vulnerabilityNotFound.scala.html
@@ -2,7 +2,8 @@
 @(
     projectsWithSelection: ProjectsWithSelection,
     name: String,
-    failedProjects: FailedProjects
+    failedProjects: FailedProjects,
+    issueOption: Option[(ExportedVulnerability[String], String)]
 )(implicit header: DefaultRequest)
 
 @main(
@@ -19,6 +20,9 @@
                 <a class="btn btn-success" href="@routes.Statistics.vulnerability(name, None)">Look at all the projects!</a>
             </li>
         }
+        @for((ticket, issueLink) <- issueOption){
+            <li>See the <a href="@issueLink">related ticket @ticket.ticket</a>.</li>
+        }
         <li>
             Maybe the vulnerability does not affect any of the projects.<br>
             <a href="https://web.nvd.nist.gov/view/vuln/detail?vulnId=@helper.urlEncode(name)" class="btn btn-default">Look at NVD</a>