diff --git a/machines/templates/machines/aff_machines.html b/machines/templates/machines/aff_machines.html
index b9c8c9e9..c22de7c9 100644
--- a/machines/templates/machines/aff_machines.html
+++ b/machines/templates/machines/aff_machines.html
@@ -75,7 +75,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ interface.type }}</td>
             <td>{{ interface.mac_address }}</td>
             <td>{{ interface.ipv4 }}
+            {% if ipv6_enabled %}
             {{ interface.ipv6 }}
+	    {% endif %}
 	    </td>
             <td>
                 <div class="dropdown">