diff --git a/cmd/dockerd/daemon_windows.go b/cmd/dockerd/daemon_windows.go
index baf617cbb1..73a9c29095 100644
--- a/cmd/dockerd/daemon_windows.go
+++ b/cmd/dockerd/daemon_windows.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/containerd/log"
 	"github.com/docker/docker/daemon/config"
+	"github.com/docker/docker/libcontainerd/supervisor"
 	"github.com/docker/docker/pkg/system"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
diff --git a/daemon/daemon_windows.go b/daemon/daemon_windows.go
index b043526bb2..814cd56ae0 100644
--- a/daemon/daemon_windows.go
+++ b/daemon/daemon_windows.go
@@ -563,7 +563,7 @@ func (daemon *Daemon) initLibcontainerd(ctx context.Context, cfg *config.Config)
 
 	rt := cfg.DefaultRuntime
 	if rt == "" {
-		if daemon.configStore.ContainerdAddr == "" {
+		if cfg.ContainerdAddr == "" {
 			rt = config.WindowsV1RuntimeName
 		} else {
 			rt = config.WindowsV2RuntimeName
@@ -580,7 +580,7 @@ func (daemon *Daemon) initLibcontainerd(ctx context.Context, cfg *config.Config)
 			daemon,
 		)
 	case config.WindowsV2RuntimeName:
-		if daemon.configStore.ContainerdAddr == "" {
+		if cfg.ContainerdAddr == "" {
 			return fmt.Errorf("cannot use the specified runtime %q without containerd", rt)
 		}
 		daemon.containerd, err = remote.NewClient(