diff --git a/src/Container/GenericContainer.php b/src/Container/GenericContainer.php
index 6edcf2c..8bb17d7 100644
--- a/src/Container/GenericContainer.php
+++ b/src/Container/GenericContainer.php
@@ -59,6 +59,7 @@ class GenericContainer implements TestContainer
     {
         $this->image = $image;
         $this->dockerClient = DockerContainerClient::getDockerClient();
+        $this->waitStrategy = new WaitForContainer();
     }
 
     public function getId(): string
@@ -185,10 +186,6 @@ class GenericContainer implements TestContainer
 
         $this->dockerClient->containerStart($this->id);
 
-        if (!isset($this->waitStrategy)) {
-            $this->withWait(new WaitForContainer());
-        }
-
         $startedContainer = new StartedGenericContainer($this->id);
         $this->waitStrategy->wait($startedContainer);