diff --git a/pkg/kubelet/kuberuntime/kuberuntime_manager.go b/pkg/kubelet/kuberuntime/kuberuntime_manager.go
index 1e19bc27426..d4bd574db94 100644
--- a/pkg/kubelet/kuberuntime/kuberuntime_manager.go
+++ b/pkg/kubelet/kuberuntime/kuberuntime_manager.go
@@ -471,13 +471,6 @@ func (m *kubeGenericRuntimeManager) computePodContainerChanges(pod *api.Pod, pod
 
 	// check the status of containers.
 	for index, container := range pod.Spec.Containers {
-		if sandboxChanged {
-			message := fmt.Sprintf("Container %+v's pod sandbox is dead, the container will be recreated.", container)
-			glog.Info(message)
-			changes.ContainersToStart[index] = message
-			continue
-		}
-
 		containerStatus := podStatus.FindContainerStatusByName(container.Name)
 		if containerStatus == nil || containerStatus.State != kubecontainer.ContainerStateRunning {
 			if kubecontainer.ShouldContainerBeRestarted(&container, pod, podStatus) {
@@ -487,6 +480,14 @@ func (m *kubeGenericRuntimeManager) computePodContainerChanges(pod *api.Pod, pod
 			}
 			continue
 		}
+		if sandboxChanged {
+			if pod.Spec.RestartPolicy != api.RestartPolicyNever {
+				message := fmt.Sprintf("Container %+v's pod sandbox is dead, the container will be recreated.", container)
+				glog.Info(message)
+				changes.ContainersToStart[index] = message
+			}
+			continue
+		}
 
 		if initFailed {
 			// Initialization failed and Container exists.