diff --git a/ChangeLog b/ChangeLog
index 262d6b387..0f9dfa428 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-15  Peter Stephenson  <pws@csr.com>
+
+	* 12650: Completion/Builtins/_zmodload: don't lists aliases if
+	there aren't any.
+
 2000-08-15  Bart Schaefer  <schaefer@zsh.org>
 
 	* 12652: Src/module.c: Fix variable scoping problem that caused
diff --git a/Completion/Builtins/_zmodload b/Completion/Builtins/_zmodload
index d182cbff7..fd476ca99 100644
--- a/Completion/Builtins/_zmodload
+++ b/Completion/Builtins/_zmodload
@@ -11,8 +11,11 @@ else
   while _tags; do
     _requested files expl 'module file' \
       _files -W module_path -/g '*.(dll|s[ol])(:r)' && ret=0
-    _requested aliases expl 'module alias' \
-      compadd -- ${${(f)"$(zmodload -A)"}%% *} && ret=0
+    if _requested aliases expl 'module alias'; then
+      local array
+      array=(${${(f)"$(zmodload -A)"}%% *})
+      (( $#array )) && compadd "${expl[@]}" -- $array && ret=0
+    fi
     (( ret )) || break
   done
 fi