diff --git a/daemon/daemon_windows.go b/daemon/daemon_windows.go
index 33d5049710..832a77914e 100644
--- a/daemon/daemon_windows.go
+++ b/daemon/daemon_windows.go
@@ -36,6 +36,10 @@ func checkKernel() error {
 // adaptContainerSettings is called during container creation to modify any
 // settings necessary in the HostConfig structure.
 func (daemon *Daemon) adaptContainerSettings(hostConfig *runconfig.HostConfig, adjustCPUShares bool) {
+	if hostConfig == nil {
+		return
+	}
+
 	if hostConfig.CPUShares < 0 {
 		logrus.Warnf("Changing requested CPUShares of %d to minimum allowed of %d", hostConfig.CPUShares, windowsMinCPUShares)
 		hostConfig.CPUShares = windowsMinCPUShares