diff --git a/@xen-orchestra/fs/src/s3.js b/@xen-orchestra/fs/src/s3.js
index 7706c9702..e53771a47 100644
--- a/@xen-orchestra/fs/src/s3.js
+++ b/@xen-orchestra/fs/src/s3.js
@@ -171,8 +171,7 @@ export default class S3Handler extends RemoteHandlerAbstract {
   }
 
   async _rmdir(path) {
-    const entries = await this._list(path)
-    if (entries.length !== 0) {
+    if (await this._isNotEmptyDir(path)) {
       const error = new Error(`ENOTEMPTY: directory not empty, rmdir '${path}`)
       error.code = 'ENOTEMPTY'
       error.path = path