diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker
index d1984a5552..c82e3cf0b2 100644
--- a/contrib/completion/bash/docker
+++ b/contrib/completion/bash/docker
@@ -2857,11 +2857,14 @@ _docker_service_ls() {
 			__docker_nospace
 			return
 			;;
+		--format)
+			return
+			;;
 	esac
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--filter -f --help --quiet -q" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--filter -f --format --help --quiet -q" -- "$cur" ) )
 			;;
 	esac
 }
@@ -3908,14 +3911,17 @@ _docker_stack_services() {
 			__docker_nospace
 			return
 			;;
+		--format)
+			return
+			;;
 	esac
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--filter -f --help --quiet -q" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--filter -f --format --help --quiet -q" -- "$cur" ) )
 			;;
 		*)
-			local counter=$(__docker_pos_first_nonflag '--filter|-f')
+			local counter=$(__docker_pos_first_nonflag '--filter|-f|--format')
 			if [ $cword -eq $counter ]; then
 				__docker_complete_stacks
 			fi