diff --git a/multinode-demo/client.sh b/multinode-demo/client.sh
index 5e11b455aabbae..6a4c8cacafe85e 100755
--- a/multinode-demo/client.sh
+++ b/multinode-demo/client.sh
@@ -7,7 +7,14 @@ here=$(dirname "$0")
 # shellcheck source=multinode-demo/common.sh
 source "$here"/common.sh
 
-leader=${1:-${here}/..}  # Default to local solana repo
+leader=$1
+if [[ -z $leader ]]; then
+  if [[ -d "$SNAP" ]]; then
+    leader=testnet.solana.com # Default to testnet when running as a Snap
+  else
+    leader=$here/.. # Default to local solana repo
+  fi
+fi
 count=${2:-1}
 
 rsync_leader_url=$(rsync_url "$leader")
diff --git a/multinode-demo/common.sh b/multinode-demo/common.sh
index 84edfde7d1dc94..8255997ececfee 100644
--- a/multinode-demo/common.sh
+++ b/multinode-demo/common.sh
@@ -14,6 +14,13 @@ if [[ -d "$SNAP" ]]; then # Running inside a Linux Snap?
     else
       printf "%s/command-%s.wrapper" "$SNAP" "$program"
     fi
+    if [[ "$program" = client-demo ]]; then
+      # TODO: Merge client.sh functionality into solana-client-demo proper and
+      #       remove this special case
+      printf "%s/bin/solana-%s" "$SNAP" "$program"
+    else
+      printf "%s/command-%s.wrapper" "$SNAP" "$program"
+    fi
   }
   rsync="$SNAP"/bin/rsync
   SOLANA_METRICS_CONFIG="$(snapctl get metrics-config)"