diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker
index 2cba086fe..e4f828202 100755
--- a/contrib/completion/bash/docker
+++ b/contrib/completion/bash/docker
@@ -338,8 +338,6 @@ _docker_docker() {
 			;;
 	esac
 
-	__docker_complete_log_driver_options && return
-
 	case "$cur" in
 		-*)
 			COMPREPLY=( $( compgen -W "$boolean_options $global_options_with_args" -- "$cur" ) )
@@ -528,6 +526,8 @@ _docker_daemon() {
 			;;
 	esac
 
+	__docker_complete_log_driver_options && return
+
 	case "$cur" in
 		-*)
 			COMPREPLY=( $( compgen -W "$boolean_options $options_with_args" -- "$cur" ) )