diff --git a/daemon/start.go b/daemon/start.go
index 1a5b0e7559..6c94fd5482 100644
--- a/daemon/start.go
+++ b/daemon/start.go
@@ -119,6 +119,9 @@ func (daemon *Daemon) containerStart(container *container.Container, checkpoint
 				container.SetExitCode(128)
 			}
 			container.ToDisk()
+
+			container.Reset(false)
+
 			daemon.Cleanup(container)
 			// if containers AutoRemove flag is set, remove it after clean up
 			if container.HostConfig.AutoRemove {
@@ -187,8 +190,6 @@ func (daemon *Daemon) containerStart(container *container.Container, checkpoint
 			container.SetExitCode(127)
 		}
 
-		container.Reset(false)
-
 		return fmt.Errorf("%s", errDesc)
 	}