diff --git a/engine/podwatcher/container.go b/engine/podwatcher/container.go
index 7c16753..c45f01d 100644
--- a/engine/podwatcher/container.go
+++ b/engine/podwatcher/container.go
@@ -81,7 +81,8 @@ type containerWatchInfo struct {
 	exitCode int32
 	reason   string
 
-	addedAt time.Time
+	addedAt  time.Time
+	failedAt time.Time
 }
 
 type containerState int
diff --git a/engine/podwatcher/watcher.go b/engine/podwatcher/watcher.go
index 997aba3..2d23aa6 100644
--- a/engine/podwatcher/watcher.go
+++ b/engine/podwatcher/watcher.go
@@ -188,7 +188,41 @@ func (pw *PodWatcher) updateContainers(containers []containerInfo) {
 		// Often container the current image will revert back to the placeholder image.
 		// Kubernetes is probably downloading an image for the container in the background.
 		if cs.state == stateTerminated && cs.exitCode == 2 && cs.reason == "Error" {
+			if cs.restartCount == 0 {
+				continue
+			}
+
+			if c.failedAt.IsZero() {
+				logrus.
+					WithField("pod", pw.podName).
+					WithField("container", c.id).
+					WithFields(cs.stateToMap()).
+					Trace("PodWatcher: Container failed. Trying recovery...")
+				c.failedAt = time.Now()
+			} else if time.Since(c.failedAt) < time.Minute {
+				logrus.
+					WithField("pod", pw.podName).
+					WithField("container", c.id).
+					WithFields(cs.stateToMap()).
+					Trace("PodWatcher: Container failed. Waiting to recover...")
+			} else {
+				logrus.
+					WithField("pod", pw.podName).
+					WithField("container", c.id).
+					WithFields(cs.stateToMap()).
+					Debug("PodWatcher: Container failed.")
+
+				c.stepState = stepStateFailed
+				c.exitCode = cs.exitCode
+				c.reason = cs.reason
+
+				pw.notifyClients(c)
+			}
+
 			continue
+
+		} else {
+			c.failedAt = time.Time{}
 		}
 
 		switch cs.state {
@@ -200,7 +234,7 @@ func (pw *PodWatcher) updateContainers(containers []containerInfo) {
 					WithField("pod", pw.podName).
 					WithField("container", c.id).
 					WithFields(cs.stateToMap()).
-					Debug("PodWatcher: Container failed.")
+					Debug("PodWatcher: Container placeholder terminated.")
 			} else {
 				c.stepState = stepStateFinished