diff --git a/element.go b/element.go
index 46eb5963..acb3c8e0 100644
--- a/element.go
+++ b/element.go
@@ -570,7 +570,7 @@ func (el *Element) WaitInteractable() (pt *proto.Point, err error) {
 // Wait until the js returns true
 func (el *Element) Wait(opts *EvalOptions) error {
 	return utils.Retry(el.ctx, el.sleeper(), func() (bool, error) {
-		res, err := el.Evaluate(opts.This(el.Object))
+		res, err := el.Evaluate(opts.ByPromise().This(el.Object))
 		if err != nil {
 			return true, err
 		}
diff --git a/page.go b/page.go
index 9367a419..705e4f91 100644
--- a/page.go
+++ b/page.go
@@ -572,7 +572,7 @@ func (p *Page) EvalOnNewDocument(js string) (remove func() error, err error) {
 // Wait until the js returns true
 func (p *Page) Wait(this *proto.RuntimeRemoteObject, js string, params []interface{}) error {
 	return utils.Retry(p.ctx, p.sleeper(), func() (bool, error) {
-		opts := Eval(js, params...).This(this)
+		opts := Eval(js, params...).ByPromise().This(this)
 
 		res, err := p.Evaluate(opts)
 		if err != nil {