diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml
index 97f5ff79054b..83b1df5394cc 100644
--- a/.circleci/workflows.yml
+++ b/.circleci/workflows.yml
@@ -1110,7 +1110,9 @@ commands:
             <<parameters.server-start-command>>
           background: true
       - run:
-          condition: <<parameters.wait-on>>
+          condition:
+            and:
+              - equal: [ "", <<parameters.wait-on>> ]
           name: "Waiting on server to boot: <<parameters.wait-on>>"
           command: |
             npm i -g wait-on