diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker
index abde5ce14c..1d9ee41816 100644
--- a/contrib/completion/bash/docker
+++ b/contrib/completion/bash/docker
@@ -1639,9 +1639,15 @@ _docker_swarm_join() {
 }
 
 _docker_swarm_update() {
+	case "$prev" in
+		--auto-accept|--cert-expiry|--dispatcher-heartbeat|--secret|--task-history-limit)
+			return
+			;;
+	esac
+
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--auto-accept --dispatcher-heartbeat --help --secret --task-history-limit" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--auto-accept --cert-expiry --dispatcher-heartbeat --help --secret --task-history-limit" -- "$cur" ) )
 			;;
 	esac
 }