diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
index 94455b326..6de64cf85 100644
--- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
+++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
@@ -314,6 +314,10 @@ function interfaces_status()
 		    end
 	    end
 	    
+	    if gateway == "" then
+		    connectivity = 'ERROR'
+	    end
+	    
 	    -- Detect if WAN get an IPv6
 	    local ipv6_discover = 'NONE'
 	    if tonumber((sys.exec("sysctl net.ipv6.conf.all.disable_ipv6")):match(" %d+")) == 0 then
diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
index b3a067123..6dd791fb7 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
@@ -194,7 +194,10 @@
 					{
 						statusMessage += 'No IP defined<br />'
 					}
-					if(gw_ping == 'DOWN')
+					if(gateway == '')
+					{
+						statusMessage += 'No gateway defined<br />'
+					} else if(gw_ping == 'DOWN')
 					{
 						statusMessage += 'Gateway DOWN<br />'
 					}