diff --git a/WHATS_NEW b/WHATS_NEW
index c08f2a539..426f302e3 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.99 - 
 ===================================
+  Fix pvs -o pv_free reporting for PVs with zero PE count.
   Fix missing cleanup of flags when the LV is detached from pool.
   Fix check for some forbidden discards conversion of thin pools.
   Add pool_is_active() to check for any pool related active LV.
diff --git a/lib/metadata/pv.c b/lib/metadata/pv.c
index 09b869b79..3cd06aa21 100644
--- a/lib/metadata/pv.c
+++ b/lib/metadata/pv.c
@@ -106,7 +106,7 @@ uint64_t pv_free(const struct physical_volume *pv)
 {
 	uint64_t freespace;
 
-	if (!pv->pe_count)
+	if (!pv->vg || is_orphan_vg(pv->vg->name))
 		freespace = pv->size;
 	else
 		freespace = (uint64_t)