diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker
index 299f43bd9f..38565868c2 100644
--- a/contrib/completion/bash/docker
+++ b/contrib/completion/bash/docker
@@ -1821,8 +1821,10 @@ _docker_run() {
 			return
 			;;
 		--security-opt)
-			COMPREPLY=( $( compgen -W "apparmor label seccomp" -S "=" -- "$cur") )
-			__docker_nospace
+			COMPREPLY=( $( compgen -W "apparmor= label= no-new-privileges seccomp=" -- "$cur") )
+			if [ "${COMPREPLY[*]}" != "no-new-privileges" ] ; then
+				__docker_nospace
+			fi
 			return
 			;;
 		--user|-u)