diff --git a/src/host/HostSharePCI.cc b/src/host/HostSharePCI.cc
index 1bbd960cd4..3eb8cc6395 100644
--- a/src/host/HostSharePCI.cc
+++ b/src/host/HostSharePCI.cc
@@ -211,6 +211,9 @@ void HostSharePCI::del(const vector<VectorAttribute *> &devs)
         {
             pci_it->second->vmid = -1;
             pci_it->second->attrs->replace("VMID",-1);
+
+            // Clean address from VM as it's not using it anymore
+            (*it)->remove("ADDRESS");
         }
     }
 };
diff --git a/src/lcm/LifeCycleStates.cc b/src/lcm/LifeCycleStates.cc
index 57b2f0c16f..626f6dd5a9 100644
--- a/src/lcm/LifeCycleStates.cc
+++ b/src/lcm/LifeCycleStates.cc
@@ -938,12 +938,12 @@ void  LifeCycleManager::epilog_success_action(int vid)
 
     vmpool->update_history(vm);
 
-    vmpool->update(vm);
-
     vm->get_capacity(sr);
 
     hpool->del_capacity(vm->get_hid(), sr);
 
+    vmpool->update(vm);
+
     //----------------------------------------------------
 
     dm->trigger(action,vid);