diff --git a/contrib/completion/zsh/_docker b/contrib/completion/zsh/_docker
index a65e5f786f..659b4bbf6d 100644
--- a/contrib/completion/zsh/_docker
+++ b/contrib/completion/zsh/_docker
@@ -727,7 +727,10 @@ __docker_container_subcommand() {
             # @TODO
             ;;
         (rename)
-            __docker_subcommand && ret=0
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -):old name:__docker_complete_containers" \
+                "($help -):new name: " && ret=0
             ;;
         (restart)
             __docker_subcommand && ret=0
@@ -2119,10 +2122,7 @@ __docker_subcommand() {
                 "($help -): :__docker_images" && ret=0
             ;;
         (rename)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -):old name:__docker_complete_containers" \
-                "($help -):new name: " && ret=0
+            __docker_container_subcommand && ret=0
             ;;
         (stop)
             _arguments $(__docker_arguments) \