diff --git a/data/helpers b/data/helpers
index 5ec562f61..e1b26db5c 100644
--- a/data/helpers
+++ b/data/helpers
@@ -1,8 +1,8 @@
 # -*- shell-script -*-
 
+readonly XTRACE_ENABLE=$(set +o | grep xtrace) # This is a trick to later only restore set -x if it was set when calling this script
 set +x
 for helper in $(run-parts --list /usr/share/yunohost/helpers.d 2>/dev/null) ; do
     [ -r $helper ] && . $helper || true
 done
-set -x
-
+eval "$XTRACE_BKP"