diff --git a/plugins/dircycle/dircycle.plugin.zsh b/plugins/dircycle/dircycle.plugin.zsh
index 2f32277cf..8c58cab4c 100644
--- a/plugins/dircycle/dircycle.plugin.zsh
+++ b/plugins/dircycle/dircycle.plugin.zsh
@@ -9,6 +9,8 @@
 #  pushd -N: start counting from right of `dirs' output
 
 switch-to-dir () {
+	[[ ${#dirstack} -eq 0 ]] && return
+
 	while ! builtin pushd -q $1 &>/dev/null; do
 		# We found a missing directory: pop it out of the dir stack
 		builtin popd -q $1