@@ -652,8 +652,12 @@ func (daemon *Daemon) Shutdown() error {

 	// Keep mounts and networking running on daemon shutdown if

 	// we are to keep containers running and restore them.

 	if daemon.configStore.LiveRestore {

-		return nil

+		// check if there are any running containers, if none we should do some cleanup

+		if ls, err := daemon.Containers(&types.ContainerListOptions{}); len(ls) != 0 || err != nil {

+			return nil

+		}

 	}

+

 	if daemon.containers != nil {

 		logrus.Debug("starting clean shutdown of all containers...")

 		daemon.containers.ApplyAll(func(c *container.Container) {