diff --git a/ennstatus/api/functions.py b/ennstatus/api/functions.py
--- a/ennstatus/api/functions.py
+++ b/ennstatus/api/functions.py
@@ -75,10 +75,8 @@ def update_server(server, ip):
     if server['server_type'] == 'Bridge':
         server['obfs'] = literal_eval(server['obfs'])
 
-        for key in ('fingerprint', 'ip'):
-            if key in server:
-                del server[key]
-
+        if 'ip' in server:
+            del server['ip']
     else:
         if 'obfs' in server:
             del server['obfs']
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
@@ -35,7 +35,7 @@
   {% if server_type in ('Exit', 'Relay') %}
     {% set headers = ['#', 'Name', 'IP', 'Server Status', 'Tor Status', 'Country', 'Fingerprint', 'Last Updated (UTC)'] %}
   {% else %}
-    {% set headers = ['#', 'Name', 'Server Status', 'Tor Status', 'Country', 'OBFS', 'Last Updated (UTC)'] %}
+    {% set headers = ['#', 'Name', 'Server Status', 'Tor Status', 'Country', 'Fingerprint', 'OBFS', 'Last Updated (UTC)'] %}
   {% endif %}
   <h2>{{ server_type }}</h2>
   <table class="table table-bordered table-striped">
@@ -62,9 +62,8 @@
             <td>{{ colorize_status(status) }}</td>
           {% endfor %}
           <td>{{ create_country(server['country']) }}</td>
-          {% if server_type in ('Exit', 'Relay') %}
-            <td>{{ create_fingerprint(server['fingerprint']) }}</td>
-          {% else %}
+          <td>{{ create_fingerprint(server['fingerprint']) }}</td>
+          {% if server_type == 'Bridge' %}
             <td>{{ colorize_obfs(server['obfs']) }}</td>
           {% endif %}
           <td>{{ server['last_updated'] }}</td>