diff --git a/ennstatus/templates/status/macros.html b/ennstatus/templates/status/macros.html
--- a/ennstatus/templates/status/macros.html
+++ b/ennstatus/templates/status/macros.html
@@ -52,7 +52,7 @@
       </tr>
     </thead>
     <tbody>
-      {% for server in servers %}
+      {% for server in servers|sort(attribute='server_name')|sort(attribute='country') %}
       <tr {% if server['server_name'] in config['ENNSTATUS_BRIDGE_PROGRAM'] %}class="info"{% endif %}>
           <td>{{ loop.index }}</td>
           {% if server_type in ('Exit', 'Relay') %}