diff --git a/journals/search_indexes.py b/journals/search_indexes.py
index 08c3b2898fcfc8613a8e4eb8d48a398ca914d87f..89035e4731cb1cd2644d7c25225f5ca29ec414d0 100644
--- a/journals/search_indexes.py
+++ b/journals/search_indexes.py
@@ -1,5 +1,3 @@
-# import datetime
-
 from haystack import indexes
 
 from .models import Publication
diff --git a/submissions/models.py b/submissions/models.py
index 61d1f8555517f1afd33a60a1a6dd7b0a5c1f589b..f9cdcfd6f731c28c9ef43b839e2b76e04d9e12ba 100644
--- a/submissions/models.py
+++ b/submissions/models.py
@@ -139,11 +139,9 @@ class Submission(models.Model):
             header += ' (current version)'
         else:
             header += ' (deprecated version ' + str(self.arxiv_vn_nr) + ')'
-        try:
+        if hasattr(self, 'publication') and self.publication.is_published:
             header += ' (published as %s (%s))' % (
                 self.publication.doi_string, self.publication.publication_date.strftime('%Y'))
-        except Publication.DoesNotExist:
-            pass
         return header
 
     def touch(self):
diff --git a/submissions/templates/partials/submissions/submission_card_content.html b/submissions/templates/partials/submissions/submission_card_content.html
index aa9128c75d3e9ac2f5ff0e87f181f13e5c4bcceb..80ca856c5ff151077fdc79ce337ed439706983da 100644
--- a/submissions/templates/partials/submissions/submission_card_content.html
+++ b/submissions/templates/partials/submissions/submission_card_content.html
@@ -4,7 +4,7 @@
     <p class="text-muted mb-0">
         Version {{ submission.arxiv_vn_nr }} ({% if submission.is_current %}current version{% else %}deprecated version {{ submission.arxiv_vn_nr }}{% endif %})
         <br>
-        {% if submission.publication %}
+        {% if submission.publication and submission.publication.is_published %}
             Published as <a href="{{ submission.publication.get_absolute_url }}">{{ submission.publication.in_issue.in_volume.in_journal.get_abbreviation_citation }} <strong>{{ submission.publication.in_issue.in_volume.number }}</strong>, {{ submission.publication.get_paper_nr }} ({{ submission.publication.publication_date|date:'Y' }})</a>
         {% else %}
             Submitted {{ submission.submission_date }} to {{ submission.get_submitted_to_journal_display }}
diff --git a/submissions/templates/submissions/submission_detail.html b/submissions/templates/submissions/submission_detail.html
index 0d6dd800738d0cec86087a939f8efd0969f93639..fe0b693f82a68a5b6dbde4440f70d88653c7f0f4 100644
--- a/submissions/templates/submissions/submission_detail.html
+++ b/submissions/templates/submissions/submission_detail.html
@@ -26,7 +26,7 @@
         <h3 class="mb-3">by {{submission.author_list}}</h3>
 
         <div class="pl-2">
-            {% if submission.publication %}
+            {% if submission.publication and submission.publication.is_published %}
                 <h3>- Published as <a href="{{submission.publication.get_absolute_url}}">{{submission.publication.in_issue.in_volume.in_journal.get_abbreviation_citation}} <strong>{{submission.publication.in_issue.in_volume.number}}</strong>, {{submission.publication.get_paper_nr}} ({{submission.publication.publication_date|date:'Y'}})</a></h3>
             {% endif %}