diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index 3f0f37f6..f4c7a741 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -368,7 +368,12 @@ function show_ip_addresses {
     echo 'IP/DNS addresses'
     echo '================'
     echo ''
-    echo "IPv4: $(get_ipv4_address)    IPv6: $(get_ipv6_address)"
+    echo -n "IPv4: $(get_ipv4_address)"
+    ipv6_address="$(get_ipv6_address)"
+    if [ ${#ipv6_address} -gt 0 ]; then
+        echo "    IPv6: $(ipv6_address)"
+    fi
+    echo ''
     echo ''
 }