diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
index 3be909445..2c7713fa3 100644
--- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
+++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
@@ -1463,6 +1463,10 @@ function settings_add()
 	local status_getip_timeout = luci.http.formvalue("status_getip_timeout") or "1"
 	ucic:set("openmptcprouter","settings","status_getip_timeout",status_getip_timeout)
 
+	-- Whois timeout
+	local status_whois_timeout = luci.http.formvalue("status_whois_timeout") or "2"
+	ucic:set("openmptcprouter","settings","status_whois_timeout",status_whois_timeout)
+
 	-- Enable/disable loop detection
 	local disableloopdetection = luci.http.formvalue("disableloopdetection") or "0"
 	ucic:set("openmptcprouter","settings","disableloopdetection",disableloopdetection)
diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm
index 285f62a4b..c858eac44 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm
@@ -286,7 +286,16 @@
 		    </div>
 		</div>
 	    </div>
-	    
+	    <div class="cbi-value">
+	        <label class="cbi-value-title"><%:Whois WAN IPs retrieve timeout%></label>
+	        <div class="cbi-value-field">
+		    <input type="text" name="status_whois_timeout" class="cbi-input-text" value="<%=luci.model.uci.cursor():get("openmptcprouter","settings","status_whois_timeout")%>">
+		    <br />
+		    <div class="cbi-value-description">
+			<%:Timeout for retrieving Whois WANs IP on status pages%>
+		    </div>
+		</div>
+	    </div>
 	    <div class="cbi-value">
 		<label class="cbi-value-title"><%:Disable interfaces auto rename%></label>
 		<div class="cbi-value-field">
diff --git a/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter b/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter
index 7d05eda2f..c30836b1d 100755
--- a/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter
+++ b/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter
@@ -98,6 +98,12 @@ if [ "$(uci -q get openmptcprouter.settings.status_getip_timeout)" = "" ]; then
 		commit openmptcprouter
 	EOF
 fi
+if [ "$(uci -q get openmptcprouter.settings.status_whois_timeout)" = "" ]; then
+	uci -q batch <<-EOF >/dev/null
+		set openmptcprouter.settings.status_whois_timeout=2
+		commit openmptcprouter
+	EOF
+fi
 if [ "$(uci -q get openmptcprouter.settings.enable_nodelay)" = "" ]; then
 	uci -q batch <<-EOF >/dev/null
 		set openmptcprouter.settings.enable_nodelay=1