diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index 064d05079c66f02c4bc383e6107c0d462152597f..203a367acc9596dc4ce21f530d2791e86ad4ebf3 100644
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -2221,7 +2221,6 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def,
     if (obj && obj->privateData) {
         priv = obj->privateData;
         /* if this is the live domain object, we persist the PCI addresses */
-        virDomainPCIAddressSetFree(priv->pciaddrs);
         priv->pciaddrs = addrs;
         addrs = NULL;
     }
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 3197aa9fade5c3df49f16a68e42880da6bb0139e..ea3e45c024441146a212f177d972635b5172e46b 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -6444,6 +6444,8 @@ void qemuProcessStop(virQEMUDriverPtr driver,
     priv->autoCpuset = NULL;
 
     /* remove address data */
+    virDomainPCIAddressSetFree(priv->pciaddrs);
+    priv->pciaddrs = NULL;
     virDomainUSBAddressSetFree(priv->usbaddrs);
     priv->usbaddrs = NULL;