diff --git a/@xen-orchestra/cr-seed-cli/package.json b/@xen-orchestra/cr-seed-cli/package.json
index 5b84770fb..8fd45b696 100644
--- a/@xen-orchestra/cr-seed-cli/package.json
+++ b/@xen-orchestra/cr-seed-cli/package.json
@@ -16,6 +16,6 @@
   },
   "dependencies": {
     "golike-defer": "^0.4.1",
-    "xen-api": "^0.24.6"
+    "xen-api": "^0.25.0"
   }
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 540cd2809..672fd6a5a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,9 @@
 - [Backup NG] Ability to set the interval of the full backups [#1783](https://github.com/vatesfr/xen-orchestra/issues/1783) (PR [#4083](https://github.com/vatesfr/xen-orchestra/pull/4083))
 - [Hosts] Display a warning icon if you have XenServer license restrictions [#4091](https://github.com/vatesfr/xen-orchestra/issues/4091) (PR [#4094](https://github.com/vatesfr/xen-orchestra/pull/4094))
 - [Restore] Ability to restore a metadata backup [#4004](https://github.com/vatesfr/xen-orchestra/issues/4004) (PR [#4023](https://github.com/vatesfr/xen-orchestra/pull/4023))
+- Improve connection to XCP-ng/XenServer hosts:
+  - never disconnect by itself even in case of errors
+  - never stop watching events
 
 ### Bug fixes
 
diff --git a/packages/xapi-explore-sr/package.json b/packages/xapi-explore-sr/package.json
index d88b70f3c..54f2a8e18 100644
--- a/packages/xapi-explore-sr/package.json
+++ b/packages/xapi-explore-sr/package.json
@@ -41,7 +41,7 @@
     "human-format": "^0.10.0",
     "lodash": "^4.17.4",
     "pw": "^0.0.4",
-    "xen-api": "^0.24.6"
+    "xen-api": "^0.25.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.1.5",
diff --git a/packages/xen-api/package.json b/packages/xen-api/package.json
index 20431cfff..3c1dddec7 100644
--- a/packages/xen-api/package.json
+++ b/packages/xen-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "xen-api",
-  "version": "0.24.6",
+  "version": "0.25.0",
   "license": "ISC",
   "description": "Connector to the Xen API",
   "keywords": [
diff --git a/packages/xo-server/package.json b/packages/xo-server/package.json
index be3304780..e4d10e66d 100644
--- a/packages/xo-server/package.json
+++ b/packages/xo-server/package.json
@@ -122,7 +122,7 @@
     "value-matcher": "^0.2.0",
     "vhd-lib": "^0.6.0",
     "ws": "^6.0.0",
-    "xen-api": "^0.24.6",
+    "xen-api": "^0.25.0",
     "xml2js": "^0.4.19",
     "xo-acl-resolver": "^0.4.1",
     "xo-collection": "^0.4.1",