diff --git a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
index 57b1412c5..edd7a35f6 100755
--- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
+++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
@@ -1669,8 +1669,15 @@ fi
 
 #if [ "$(uci -q show openmptcprouter | grep server)" != "" ] && [ "$(uci -q show openmptcprouter | grep password)" != "" ] && [ "$(pgrep openmptcprouter-vps)" = "" ] && [ "$(uci -q show openmptcprouter | grep admin_error=\'1\')" = "" ] && ([ "$(uci -q show openmptcprouter | grep set_firewall=\'1\')" != "" ] || [ -z "$(iptables-save | grep omr_dst_bypass_${OMR_TRACKER_DEVICE})" ]); then
 if [ "$(pgrep -f set_vps_firewall)" = "" ] && [ "$(uci -q show openmptcprouter | grep server)" != "" ] && [ "$(uci -q show openmptcprouter | grep password)" != "" ] && [ "$(pgrep openmptcprouter-vps)" = "" ] && [ "$(uci -q show openmptcprouter | grep admin_error=\'1\')" = "" ] && [ "$(uci -q show openmptcprouter | grep set_firewall=\'1\')" != "" ]; then
-	_log "Set firewall on server"
-	/etc/init.d/openmptcprouter-vps set_vps_firewall >/dev/null 2>&1
+	check_server_fw() {
+		[ "$(uci -q get openmptcprouter.$1.set_firewall)" = "1" ] && {
+			_log "Set firewall on server $1"
+			/etc/init.d/openmptcprouter-vps set_vps_firewall $1 >/dev/null 2>&1
+		}
+	}
+	config_load openmptcprouter
+	config_foreach check_server_fw server
+
 
 	run_fw_include() {
 		[ -n "$1" ] && [ "$(uci -q get firewall.$1.reload)" = "0" ] && sh $(uci -q get firewall.$1.path) >/dev/null 2>&1
diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
index 1be9331a4..cc6425cdd 100755
--- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps
+++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -1191,8 +1191,13 @@ _set_vps_firewall() {
 }
 
 set_vps_firewall() {
-	config_load openmptcprouter
-	config_foreach _set_vps_firewall server
+	local server_opt=$2
+	if [ -n "$server_opt" ]; then
+		_set_vps_firewall $server_opt
+	else
+		config_load openmptcprouter
+		config_foreach _set_vps_firewall server
+	fi
 }
 
 _set_ss_redir() {