diff --git a/bin/bitcoin-cli b/bin/bitcoin-cli
index 337a558..deeeeb4 100755
--- a/bin/bitcoin-cli
+++ b/bin/bitcoin-cli
@@ -7,7 +7,7 @@ UMBREL_ROOT="$(readlink -f $(dirname "${BASH_SOURCE[0]}")/..)"
 result=$(docker-compose \
   --file "${UMBREL_ROOT}/docker-compose.yml" \
   --env-file "${UMBREL_ROOT}/.env" \
-  exec bitcoin bitcoin-cli $@)
+  exec bitcoin bitcoin-cli "$@")
 
 # We need to echo with quotes to preserve output formatting
 echo "$result"
diff --git a/bin/lncli b/bin/lncli
index 3b6e896..f61f625 100755
--- a/bin/lncli
+++ b/bin/lncli
@@ -7,7 +7,7 @@ UMBREL_ROOT="$(readlink -f $(dirname "${BASH_SOURCE[0]}")/..)"
 result=$(docker-compose \
   --file "${UMBREL_ROOT}/docker-compose.yml" \
   --env-file "${UMBREL_ROOT}/.env" \
-  exec lnd lncli $@)
+  exec lnd lncli "$@")
 
 # We need to echo with quotes to preserve output formatting
 echo "$result"