diff --git a/submissions/templates/partials/submissions/submission_status.html b/submissions/templates/partials/submissions/submission_status.html
index 82438028e92314b6c417d505f29cc6b90da17efc..fb727c41e9c6865bfc23117c7ff1a69bf9b30559 100644
--- a/submissions/templates/partials/submissions/submission_status.html
+++ b/submissions/templates/partials/submissions/submission_status.html
@@ -2,6 +2,12 @@
 <div class="d-inline">
     <span class="label label-secondary">{{submission.get_status_display}}</span>
     {% if submission.publication and submission.publication.is_published %}
-        as <a href="{{submission.publication.get_absolute_url}}">{{submission.publication.in_issue.in_volume.in_journal.abbreviation_citation}} <strong>{{submission.publication.in_issue.in_volume.number}}</strong>, {{submission.publication.get_paper_nr}} ({{submission.publication.publication_date|date:'Y'}})</a>
+        as <a href="{{submission.publication.get_absolute_url}}">
+            {% if submission.publication.in_issue %}
+                {{submission.publication.in_issue.in_volume.in_journal.abbreviation_citation}} <strong>{{submission.publication.in_issue.in_volume.number}}</strong>, {{submission.publication.get_paper_nr}}
+            {% else %}
+                {{submission.publication.in_journal.abbreviation_citation}}, {{submission.publication.paper_nr}}
+            {% endif %}
+            ({{submission.publication.publication_date|date:'Y'}})</a>
     {% endif %}
 </div>