diff --git a/common/docker/client.go b/common/docker/client.go
index 86cb9dd7..dabf3aec 100644
--- a/common/docker/client.go
+++ b/common/docker/client.go
@@ -97,7 +97,7 @@ func (c *Client) AddObserver(ob ContainerObserver) error {
 func (c *Client) IsContainerNotRunning(idStr string) bool {
 	container, err := c.InspectContainer(idStr)
 	if err == nil {
-		return !container.State.Running
+		return !container.State.Running || container.State.Restarting
 	}
 	if _, notThere := err.(*docker.NoSuchContainer); notThere {
 		return true
diff --git a/proxy/proxy.go b/proxy/proxy.go
index 9dfb7972..c316c1cb 100644
--- a/proxy/proxy.go
+++ b/proxy/proxy.go
@@ -132,7 +132,7 @@ func (proxy *Proxy) AttachExistingContainers() {
 			}
 			continue
 		}
-		if containerShouldAttach(container) && (container.State.Running || container.State.Paused) {
+		if containerShouldAttach(container) && container.State.Running && !container.State.Restarting {
 			proxy.attach(container, false)
 		}
 	}