diff --git a/src/pa_extra.c b/src/pa_extra.c
index ee101891..76507039 100644
--- a/src/pa_extra.c
+++ b/src/pa_extra.c
@@ -81,7 +81,11 @@ pa_shard_nactive(pa_shard_t *shard) {
 
 size_t
 pa_shard_ndirty(pa_shard_t *shard) {
-	return ecache_npages_get(&shard->pac.ecache_dirty);
+	size_t ndirty = ecache_npages_get(&shard->pac.ecache_dirty);
+	if (shard->ever_used_hpa) {
+		ndirty += psset_ndirty(&shard->hpa_shard.psset);
+	}
+	return ndirty;
 }
 
 size_t