diff --git a/store.go b/store.go
index 8c26692..eddec72 100644
--- a/store.go
+++ b/store.go
@@ -21,6 +21,10 @@ func storeContainers(c *client.Client, containers []types.Container) {
 	lock.Lock()
 	defer lock.Unlock()
 
+	for _, container := range containers {
+		delete(store, container.ID)
+	}
+
 	for _, container := range containers {
 		if container.State != "running" {
 			continue
@@ -40,7 +44,4 @@ func storeContainers(c *client.Client, containers []types.Container) {
 
 		store[container.ID] = dumper
 	}
-
-	// TODO: remove old containers
-
 }