diff --git a/wfb_ng/cluster.py b/wfb_ng/cluster.py
index d0c09f13..6693910c 100644
--- a/wfb_ng/cluster.py
+++ b/wfb_ng/cluster.py
@@ -131,7 +131,7 @@ def get_allocator(node):
 {% endfor %}
 
 # Fail in case of connection loss
-(set +x; sleep 1; exec cat > /dev/null) &
+(sleep 1; exec cat > /dev/null) &
 
 wait -n
 '''
diff --git a/wfb_ng/server.py b/wfb_ng/server.py
index e401c123..a5c8472a 100644
--- a/wfb_ng/server.py
+++ b/wfb_ng/server.py
@@ -114,7 +114,7 @@ def init(profiles, wlans, cluster_mode):
         if cluster_mode == 'ssh':
             for node, setup_script in gen_cluster_scripts(cluster_nodes).items():
                 dl.append(SSHClientProtocol(node, settings.cluster.ssh_user,
-                                            '/bin/bash', '-x',
+                                            '/bin/bash',
                                             key=settings.cluster.ssh_key,
                                             port=settings.cluster.ssh_port,
                                             use_agent=settings.cluster.ssh_key is None,