diff --git a/net/net.sh b/net/net.sh
index 479a8a6e36..2b094f697a 100755
--- a/net/net.sh
+++ b/net/net.sh
@@ -299,12 +299,15 @@ stop_node() {
   (
     set -x
     ssh "${sshOptions[@]}" "$ipAddress" "
-      set -x;
+      set -x
       if snap list solana; then
-        sudo snap set solana mode=;
-        sudo snap remove solana;
-      fi;
-      for pattern in solana- remote- oom-monitor; do pkill -9 \$pattern; done;
+        sudo snap set solana mode=
+        sudo snap remove solana
+      fi
+      ! tmux list-sessions || tmux kill-session
+      for pattern in solana- remote- oom-monitor; do
+        pkill -9 \$pattern
+      done
     "
   ) || true
 }
diff --git a/net/remote/remote-client.sh b/net/remote/remote-client.sh
index c7e73b56cb..b38cba44ae 100755
--- a/net/remote/remote-client.sh
+++ b/net/remote/remote-client.sh
@@ -54,13 +54,17 @@ esac
 
 scripts/oom-monitor.sh > oom-monitor.log 2>&1 &
 
-set +e
-while true; do
-  echo "=== Client start: $(date)" >> client.log
-  $metricsWriteDatapoint "testnet-deploy client-begin=1"
-  clientCommand="$solana_bench_tps --num-nodes $numNodes --seconds 600 --sustained --threads $threadCount"
-  echo "$ $clientCommand" >> client.log
-  $clientCommand >> client.log 2>&1
-  $metricsWriteDatapoint "testnet-deploy client-complete=1"
-done
+! tmux list-sessions || tmux kill-session
 
+clientCommand="$solana_bench_tps --num-nodes $numNodes --seconds 600 --sustained --threads $threadCount"
+tmux new -s solana-bench-tps -d "
+  while true; do
+    echo === Client start: \$(date) >> client.log
+    $metricsWriteDatapoint 'testnet-deploy client-begin=1'
+    echo '$ $clientCommand' >> client.log
+    $clientCommand >> client.log 2>&1
+    $metricsWriteDatapoint 'testnet-deploy client-complete=1'
+  done
+"
+sleep 1
+tmux capture-pane -t solana-bench-tps -p -S -100