diff --git a/lib/infobox/node.js b/lib/infobox/node.js
index da0379e..556afc2 100644
--- a/lib/infobox/node.js
+++ b/lib/infobox/node.js
@@ -46,13 +46,16 @@ define(['sorttable', 'snabbdom', 'd3-interpolate', 'moment', 'helper', 'utils/no
             nodeIdLink(node.gateway),
             V.h('br'),
             'IPv4'
-          ]),
-          V.h('span', [
+          ])
+        ];
+
+        if (node.gateway6 !== undefined) {
+          gatewayRows.push(V.h('span', [
             nodeIdLink(node.gateway6),
             V.h('br'),
             'IPv6'
-          ])
-        ];
+          ]));
+        }
 
         return V.h('td', { props: { className: 'gateway' } }, gatewayCols);
       }
diff --git a/scss/modules/_infobox.scss b/scss/modules/_infobox.scss
index 50b22ec..e7c50c9 100644
--- a/scss/modules/_infobox.scss
+++ b/scss/modules/_infobox.scss
@@ -2,6 +2,7 @@
   .clients,
   .gateway {
     display: flex;
+    flex-flow: wrap;
 
     span {
       flex-grow: 1;