diff --git a/view/vocabularylist.twig b/view/vocabularylist.twig
index aab1edb83..ee1033385 100644
--- a/view/vocabularylist.twig
+++ b/view/vocabularylist.twig
@@ -15,7 +15,13 @@
       <h3>{{ vocabClassName }}</h3>
       <ul>
       {% for vocab in vocabArray %}
-        <li><a class="navigation-font" href="{{ vocab.id }}/{{ request.lang }}/{% if request.contentLang != request.lang and request.contentLang != '' and request.contentLang in vocab.config.languages %}?clang={{ request.contentLang }}{% endif %}">{{ vocab.title }}</a></li>
+        {% set useDefaultLanguage = request.contentLang not in vocab.config.languages and request.contentLang != '' %}
+        <li><a class="navigation-font" href="{{ vocab.id }}/{{ request.lang }}/{% if useDefaultLanguage %}?clang={{ vocab.config.defaultLanguage }}{% endif %}">
+          {% if useDefaultLanguage %}
+            {{ vocab.title(vocab.config.defaultLanguage) }}
+          {% else %}
+            {{ vocab.title(request.contentLang) }}
+          {% endif %} </a></li>
       {% endfor %}
       </ul>
     </div>
@@ -24,3 +30,8 @@
   </div>
   {% endif %}
 </div>
+
+
+
+
+