diff --git a/src/pool.c b/src/pool.c
index ce709f9..58a5211 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -385,16 +385,21 @@
 	 * replaces it with a NULL. Then the list can be released.
 	 */
 	next = pool->free_list;
-	do {
+	while (1) {
 		while (unlikely(next == POOL_BUSY)) {
 			__ha_cpu_relax();
 			next = _HA_ATOMIC_LOAD(&pool->free_list);
 		}
+
 		if (next == NULL)
-			return;
-	} while (unlikely((next = _HA_ATOMIC_XCHG(&pool->free_list, POOL_BUSY)) == POOL_BUSY));
-	_HA_ATOMIC_STORE(&pool->free_list, NULL);
-	__ha_barrier_atomic_store();
+			break;
+
+		next = _HA_ATOMIC_XCHG(&pool->free_list, POOL_BUSY);
+		if (next != POOL_BUSY) {
+			HA_ATOMIC_STORE(&pool->free_list, NULL);
+			break;
+		}
+	}
 
 	while (next) {
 		temp = next;