diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
index cff1dbac6..1aa626cd5 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
@@ -469,7 +469,7 @@ local statuslogo = ucic:get("openmptcprouter","settings","statuslogo") or "openm
 					{
 						content += String.format('%s <strong>%s</strong><br />','<%:ip address:%>', ipaddr);
 					}
-					if(ip6addr !== '')
+					if(ip6addr !== '' && gateway6 != '')
 					{
 						content += String.format('%s <strong>%s</strong><br />','<%:ipv6 address:%>', ip6addr);
 					}
@@ -477,7 +477,7 @@ local statuslogo = ucic:get("openmptcprouter","settings","statuslogo") or "openm
 					{
 						content += String.format('%s <strong>%s</strong><br />','<%:wan address:%>', wanip);
 					}
-					if(wanip6 !== '' && gateway6 != '')
+					if(wanip6 !== '')
 					{
 						content += String.format('%s <strong>%s</strong><br />','<%:wan ipv6 address:%>', wanip6);
 					}