diff --git a/internal/docker/container_store.go b/internal/docker/container_store.go
index 67fb339c..3559fce1 100644
--- a/internal/docker/container_store.go
+++ b/internal/docker/container_store.go
@@ -99,6 +99,7 @@ func (s *ContainerStore) ListContainers() ([]Container, error) {
 }
 
 func (s *ContainerStore) FindContainer(id string) (Container, error) {
+	s.wg.Wait()
 	container, ok := s.containers.Load(id)
 
 	if ok {