diff --git a/scripts/_common.sh b/scripts/_common.sh
index 6177984..52c42a2 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -48,7 +48,13 @@ garage_connect() {
   $command node connect "$peer"
   sleep 2
   # wait until layout is updated
+  local i=0
   until $command layout show 2>/dev/null | grep "${peer:0:15}"; do
+    i=$(( i + 1 ))
+    if [ $i -gt 30 ] 
+    then
+      ynh_die --message="unable to get layout from remove peer"
+    fi
     sleep 1
   done
 }
diff --git a/scripts/install b/scripts/install
index 0debe2e..93ed6de 100755
--- a/scripts/install
+++ b/scripts/install
@@ -345,7 +345,6 @@ ynh_script_progression --message="Integrating service in YunoHost..."  --weight=
 ###		- And the section "INTEGRATE SERVICE IN YUNOHOST" in the upgrade script
 
 yunohost service add --needs_exposed_ports $port --description="s3 storage" --log="/var/log/$app/$app.log" $app
-yunohost  firewall upnp reload
 
 ### Additional options starting with 3.8:
 ###