diff --git a/system-x/services/aws/lambda/src/main/java/software/tnb/aws/lambda/validation/LambdaValidation.java b/system-x/services/aws/lambda/src/main/java/software/tnb/aws/lambda/validation/LambdaValidation.java
index fe19cce3a..d8b63f3fd 100644
--- a/system-x/services/aws/lambda/src/main/java/software/tnb/aws/lambda/validation/LambdaValidation.java
+++ b/system-x/services/aws/lambda/src/main/java/software/tnb/aws/lambda/validation/LambdaValidation.java
@@ -88,6 +88,8 @@ public void createFunction(String name, Runtime runtime, String handler, SdkByte
                 }
             }
         }
+
+        client.waiter().waitUntilFunctionActive(b -> b.functionName(name));
     }
 
     public GetFunctionResponse getFunction(String name) {