diff --git a/src/freedombone-app-tox b/src/freedombone-app-tox
index a9af68e7..e5814767 100755
--- a/src/freedombone-app-tox
+++ b/src/freedombone-app-tox
@@ -189,11 +189,14 @@ function remove_tox {
 }
 
 function configure_firewall_for_tox {
-	if [ -f $COMPLETION_FILE ]; then
-		if grep -Fxq "configure_firewall_for_tox" $COMPLETION_FILE; then
-			return
+	if [ ! $INSTALLING_MESH ]; then
+		if [ -f $COMPLETION_FILE ]; then
+			if grep -Fxq "configure_firewall_for_tox" $COMPLETION_FILE; then
+				return
+			fi
 		fi
 	fi
+
 	if [[ $INSTALLED_WITHIN_DOCKER == "yes" ]]; then
 		# docker does its own firewalling
 		return
@@ -519,8 +522,10 @@ function enable_tox_repo {
 }
 
 function install_tox {
-	if grep -Fxq "install_tox" $COMPLETION_FILE; then
-		return
+	if [ ! $INSTALLING_MESH ]; then
+		if grep -Fxq "install_tox" $COMPLETION_FILE; then
+			return
+		fi
 	fi
 
 	configure_firewall_for_tox