diff --git a/app/src/main/java/io/seqera/wave/cli/App.java b/app/src/main/java/io/seqera/wave/cli/App.java
index 0872f82..a73e3e9 100644
--- a/app/src/main/java/io/seqera/wave/cli/App.java
+++ b/app/src/main/java/io/seqera/wave/cli/App.java
@@ -401,7 +401,7 @@ public void run() {
         // submit it
         SubmitContainerTokenResponse resp = client.submit(request);
         // await build to be completed
-        if( await && !isEmpty(resp.buildId) )
+        if( await )
             client.awaitImage(resp.targetImage);
         // print the wave container name
         System.out.println(dumpOutput(resp));