diff --git a/scipost_django/scipost/templates/scipost/_index_publications.html b/scipost_django/scipost/templates/scipost/_index_publications.html
index ea3ade65ce3803276cca9b0b8799e3f6d929d8fb..5b19820ddd0804cf7df8011ce4d4c63b03d1c650 100644
--- a/scipost_django/scipost/templates/scipost/_index_publications.html
+++ b/scipost_django/scipost/templates/scipost/_index_publications.html
@@ -12,7 +12,7 @@
   {% endfor %}
 </ul>
 
-{% if not session_acad_field.journals.active|length > 0 %}
+{% if session_acad_field and not session_acad_field.journals.active|length > 0 %}
   <div class="card m-2 border-2">
     <div class="card-header m-0 p-0">
       <h2 class="m-0 p-4 text-white text-center bg-danger">We are not yet active in<br>{{ session_acad_field }}</h2>
diff --git a/scipost_django/scipost/templates/scipost/_index_submissions.html b/scipost_django/scipost/templates/scipost/_index_submissions.html
index ec25ace4675fabc2c2ccdff1eeed4521552ebc2c..457a6043e12b737d6c6fc61d26bbc9223c918c41 100644
--- a/scipost_django/scipost/templates/scipost/_index_submissions.html
+++ b/scipost_django/scipost/templates/scipost/_index_submissions.html
@@ -12,6 +12,6 @@
   {% endfor %}
 </ul>
 
-{% if session_acad_field.journals.active|length > 0 %}
+{% if not session_acad_field or session_acad_field.journals.active|length > 0 %}
   <p class="mb-3 px-3"><a href="{% url 'submissions:submissions' %}">View all Submissions</a></p>
 {% endif %}
diff --git a/scipost_django/scipost/views.py b/scipost_django/scipost/views.py
index 5e7c9f8c0e199e584adc9eadf0450d7792691d08..a99c0d6fc04859c7c51d340abb5f74aae604336a 100644
--- a/scipost_django/scipost/views.py
+++ b/scipost_django/scipost/views.py
@@ -173,7 +173,7 @@ def index(request):
 def _index_submissions(request):
     submissions = Submission.objects.public()
     session_acad_field_slug = request.session.get('session_acad_field_slug', None)
-    if session_acad_field_slug and session_acad_field_slug != 'multidisciplinary':
+    if session_acad_field_slug and session_acad_field_slug != 'all':
         submissions = submissions.filter(acad_field__slug=session_acad_field_slug)
     context = {
         'submissions': submissions.order_by('-submission_date')[:3],
@@ -184,7 +184,7 @@ def _index_submissions(request):
 def _index_publications(request):
     publications = Publication.objects.published()
     session_acad_field_slug = request.session.get('session_acad_field_slug', None)
-    if session_acad_field_slug and session_acad_field_slug != 'multidisciplinary':
+    if session_acad_field_slug and session_acad_field_slug != 'all':
         publications = publications.filter(acad_field__slug=session_acad_field_slug)
     context = {
         'publications': publications.order_by('-publication_date', '-paper_nr')[:3],