diff --git a/ogcp/templates/client_list.html b/ogcp/templates/client_list.html
index 188cc2a..cd07118 100644
--- a/ogcp/templates/client_list.html
+++ b/ogcp/templates/client_list.html
@@ -34,10 +34,14 @@
                     <tr data-toggle="fieldset-entry">
                         <td>{{ client_data.addr }}</td>
                         <td>
-                            {% if client_data.speed >= 1000 %}
-                                {{ (client_data.speed / 1000) | int }} Gb/s
+                            {% if client_data.speed is not none %}
+                                {% if client_data.speed >= 1000 %}
+                                    {{ (client_data.speed / 1000) | int }} Gb/s
+                                {% else %}
+                                    {{ client_data.speed }} Mb/s
+                                {% endif %}
                             {% else %}
-                                {{ client_data.speed }} Mb/s
+                                {{ _('Not available') }}
                             {% endif %}
                         </td>
                         <td><a href="{{ url_for('action_client_info', client_ip = client_data.addr) }}">{{ _('View details') }}</a></td>