diff --git a/templates/default/main/index.html.twig b/templates/default/main/index.html.twig
index 88ababe..2a37298 100644
--- a/templates/default/main/index.html.twig
+++ b/templates/default/main/index.html.twig
@@ -34,7 +34,7 @@
                     <td class="text-align-left">
                         {% if server.name %}
                             {{ server.name }}
-                        {% elseif server.info.HostName %}
+                        {% elseif server.info %}
                             {{ server.info.HostName }}
                         {% else %}
                             #{{ server.crc32server }}
diff --git a/templates/default/server/index.html.twig b/templates/default/server/index.html.twig
index f177942..27d4ab2 100644
--- a/templates/default/server/index.html.twig
+++ b/templates/default/server/index.html.twig
@@ -45,7 +45,7 @@
 {% endmacro %}
 {% from _self import sort %}
 {% extends 'default/layout.html.twig' %}
-{% block head_title_content %}{% if server.name %}{{ server.name }}{% elseif server.info.HostName %}{{ server.info.HostName }}{% else %}#{{ server.crc32server }}{% endif %} - {{ app.name }}{% endblock %}
+{% block head_title_content %}{% if server.name %}{{ server.name }}{% elseif server.info %}{{ server.info.HostName }}{% else %}#{{ server.crc32server }}{% endif %} - {{ app.name }}{% endblock %}
 {% block main_content %}
     <div class="border-default padding-8-px margin-y-8-px">
         <h2>