diff --git a/contrib/dokku_client.sh b/contrib/dokku_client.sh
index c7be9e289..fe4b77152 100755
--- a/contrib/dokku_client.sh
+++ b/contrib/dokku_client.sh
@@ -38,17 +38,17 @@ if [[ ! -z $DOKKU_HOST ]]; then
     fi
 
     if [[ -z "$donotshift" ]]; then
-      ssh dokku@$DOKKU_HOST $*
+      ssh dokku@$DOKKU_HOST "$*"
       exit $?
     fi
 
     verb=$1
     shift
-    ssh dokku@$DOKKU_HOST "$verb" "$appname" $@
+    ssh dokku@$DOKKU_HOST "$verb" "$appname" "$@"
   }
 
   if [[ "$0" == "dokku" ]] || [[ "$0" == *dokku_client.sh ]]; then
-    _dokku $@
+    _dokku "$@"
     exit $?
   fi
 fi