diff --git a/contrib/completion/zsh/_docker b/contrib/completion/zsh/_docker
index b31e9f23b1..38453e96d3 100644
--- a/contrib/completion/zsh/_docker
+++ b/contrib/completion/zsh/_docker
@@ -999,7 +999,10 @@ __docker_image_subcommand() {
                 "($help -)*: :__docker_complete_images" && ret=0
             ;;
         (tag)
-            __docker_subcommand && ret=0
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -):source:__docker_complete_images"\
+                "($help -):destination:__docker_complete_repositories_with_tags" && ret=0
             ;;
         (help)
             _arguments $(__docker_arguments) ":subcommand:__docker_container_commands" && ret=0
@@ -2283,10 +2286,7 @@ __docker_subcommand() {
             esac
             ;;
         (tag)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -):source:__docker_complete_images"\
-                "($help -):destination:__docker_complete_repositories_with_tags" && ret=0
+            __docker_image_subcommand && ret=0
             ;;
         (volume)
             local curcontext="$curcontext" state