diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker
index 9b4f6d4997..e19173f12d 100644
--- a/contrib/completion/bash/docker
+++ b/contrib/completion/bash/docker
@@ -1710,7 +1710,6 @@ _docker_service_update() {
 		--label -l
 		--limit-cpu
 		--limit-memory
-		--mode
 		--mount -m
 		--name
 		--network
@@ -1734,6 +1733,18 @@ _docker_service_update() {
 		--registry-auth
 	"
 
+	if [ "$subcommand" = "create" ] ; then
+		options_with_args="$options_with_args
+			--mode
+		"
+
+		case "$prev" in
+			--mode)
+				COMPREPLY=( $( compgen -W "global replicated" -- "$cur" ) )
+				return
+				;;
+		esac
+	fi
 	if [ "$subcommand" = "update" ] ; then
 		options_with_args="$options_with_args
 			--arg
@@ -1751,7 +1762,7 @@ _docker_service_update() {
 
 	case "$prev" in
 		--endpoint-mode)
-			COMPREPLY=( $( compgen -W "DNSRR VIP" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "dnsrr vip" -- "$cur" ) )
 			return
 			;;
 		--env|-e)
@@ -1759,10 +1770,6 @@ _docker_service_update() {
 			__docker_nospace
 			return
 			;;
-		--mode)
-			COMPREPLY=( $( compgen -W "global replicated" -- "$cur" ) )
-			return
-			;;
 		--network)
 			__docker_complete_networks
 			return