diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker
index cafc8a6f97..0df25bf6e2 100644
--- a/contrib/completion/bash/docker
+++ b/contrib/completion/bash/docker
@@ -342,8 +342,6 @@ _docker_docker() {
 			;;
 	esac
 
-	__docker_complete_log_driver_options && return
-
 	case "$cur" in
 		-*)
 			COMPREPLY=( $( compgen -W "$boolean_options $global_options_with_args" -- "$cur" ) )
@@ -564,6 +562,9 @@ _docker_daemon() {
 			;;
 	esac
 
+	__docker_complete_log_driver_options && return
+
+	# completions for --storage-opt
 	case "${words[$cword-2]}$prev=" in
 		*dm.blkdiscard=*)
 			COMPREPLY=( $( compgen -W "false true" -- "${cur#=}" ) )