diff --git a/plugins/heroku-alias/heroku-alias.plugin.zsh b/plugins/heroku-alias/heroku-alias.plugin.zsh
index 7daf715b5..f2dc10c7d 100644
--- a/plugins/heroku-alias/heroku-alias.plugin.zsh
+++ b/plugins/heroku-alias/heroku-alias.plugin.zsh
@@ -1,3 +1,8 @@
+# Return immediately if heroku is not found
+if (( ! ${+commands[heroku]} )); then
+  return
+fi
+
 # general
 alias h='heroku'
 alias hauto='heroku autocomplete $(echo $SHELL)'