diff --git a/daemon/start.go b/daemon/start.go
index de4516c7b6..b26163c6b1 100644
--- a/daemon/start.go
+++ b/daemon/start.go
@@ -124,7 +124,11 @@ func (daemon *Daemon) containerStart(container *Container) (err error) {
 	mounts = append(mounts, container.ipcMounts()...)
 
 	container.command.Mounts = mounts
-	return daemon.waitForStart(container)
+	if err := daemon.waitForStart(container); err != nil {
+		return err
+	}
+	container.HasBeenStartedBefore = true
+	return nil
 }
 
 func (daemon *Daemon) waitForStart(container *Container) error {