diff --git a/ponysay b/ponysay
index 5fe2e7ce..ac04ba6e 100755
--- a/ponysay
+++ b/ponysay
@@ -3,7 +3,7 @@
 version=0.4
 SYSTEMPONIES=/usr/share/ponies
 HOMEPONIES="${HOME}/.ponies"
-pony=
+pony="*"
 wrap=
 
 cmd=cowsay
@@ -39,12 +39,7 @@ done
 
 # Pony not a file? Search for it
 if [[ ! -f $pony ]]; then
-
-    # Pony not set? Choose all
-    [[ -z $pony ]] && pony="*"
-
     ponies=()
-
     [[ -d $SYSTEMPONIES ]] && ponies+=( "$SYSTEMPONIES"/$pony.pony )
     [[ -d $HOMEPONIES ]] && ponies+=( "$HOMEPONIES"/$pony.pony )