diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 876b3791b5..3cc1d8dd99 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -105,15 +105,20 @@ int qemuDomainChangeEjectableMedia(struct qemud_driver *driver,
 
     qemuDomainObjEnterMonitorWithDriver(driver, vm);
     ret = qemuMonitorEjectMedia(priv->mon, driveAlias, force);
+    qemuDomainObjExitMonitor(driver, vm);
 
+    virObjectRef(vm);
     /* we don't want to report errors from media tray_open polling */
     while (retries--) {
         if (origdisk->tray_status == VIR_DOMAIN_DISK_TRAY_OPEN)
             break;
 
+        virDomainObjUnlock(vm);
         VIR_DEBUG("Waiting 500ms for tray to open. Retries left %d", retries);
         usleep(500 * 1000); /* sleep 500ms */
+        virDomainObjLock(vm);
     }
+    virObjectUnref(vm);
 
     if (disk->src) {
         /* deliberately don't depend on 'ret' as 'eject' may have failed for the
@@ -126,7 +131,7 @@ int qemuDomainChangeEjectableMedia(struct qemud_driver *driver,
         if (retries <= 0) {
             virReportError(VIR_ERR_OPERATION_FAILED, "%s",
                            _("Unable to eject media before changing it"));
-            goto exit_monitor;
+            goto audit;
         }
 
         if (disk->type != VIR_DOMAIN_DISK_TYPE_DIR) {
@@ -135,13 +140,14 @@ int qemuDomainChangeEjectableMedia(struct qemud_driver *driver,
             else if (origdisk->driverType)
                 format = origdisk->driverType;
         }
+        qemuDomainObjEnterMonitor(driver, vm);
         ret = qemuMonitorChangeMedia(priv->mon,
                                      driveAlias,
                                      disk->src, format);
+        qemuDomainObjExitMonitor(driver, vm);
     }
-exit_monitor:
-    qemuDomainObjExitMonitorWithDriver(driver, vm);
 
+audit:
     virDomainAuditDisk(vm, origdisk->src, disk->src, "update", ret >= 0);
 
     if (ret < 0)