diff --git a/@xen-orchestra/xapi/index.js b/@xen-orchestra/xapi/index.js
index 8126066d2..cfa83a45e 100644
--- a/@xen-orchestra/xapi/index.js
+++ b/@xen-orchestra/xapi/index.js
@@ -196,6 +196,11 @@ class Xapi extends Base {
 
   waitObjectState(refOrUuid, predicate, { timeout } = {}) {
     return new Promise((resolve, reject) => {
+      const object = this.getObject(refOrUuid, undefined)
+      if (object !== undefined && predicate(object)) {
+        return resolve(object)
+      }
+
       let timeoutHandle
       const stop = this.watchObject(refOrUuid, object => {
         if (predicate(object)) {
diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
index 5442b4e7e..1b33c72cb 100644
--- a/CHANGELOG.unreleased.md
+++ b/CHANGELOG.unreleased.md
@@ -32,6 +32,7 @@
 
 <!--packages-start-->
 
+- @xen-orchestra/xapi patch
 - xo-server minor
 - xo-web minor