diff --git a/etc/cherry-picker.sh b/etc/cherry-picker.sh
index bca69e25a5..b513c685a1 100755
--- a/etc/cherry-picker.sh
+++ b/etc/cherry-picker.sh
@@ -14,7 +14,7 @@ if [ -z "$user" ]; then
 fi
 
 mkdir -p $dirname
-if [ -z $AUTH_TOKEN ]; then
+if [ -z "$AUTH_TOKEN" ]; then
     git clone git@github.com:mongodb/mongo-go-driver.git $dirname
 else
     echo "$AUTH_TOKEN" > mytoken.txt
@@ -23,7 +23,7 @@ else
 fi
 
 cd $dirname
-if [ -z $AUTH_TOKEN ]; then
+if [ -z "$AUTH_TOKEN" ]; then
     git remote add $user git@github.com:$user/mongo-go-driver.git
 else
     git remote add $user https://$user:${AUTH_TOKEN}@github.com/$user/mongo-go-driver.git