diff --git a/qubesusbproxy/core3ext.py b/qubesusbproxy/core3ext.py
index 665fcce..950c3f8 100644
--- a/qubesusbproxy/core3ext.py
+++ b/qubesusbproxy/core3ext.py
@@ -35,6 +35,7 @@
 import tempfile
 from typing import List, Optional, Dict, Tuple, Any
 
+import qubes.exc
 from qubes.utils import sanitize_stderr_for_log
 
 try:
@@ -652,7 +653,7 @@ async def on_device_attach_usb(self, vm, event, device, options):
             return
 
         if device.attachment:
-            raise qubes.devices.DeviceAlreadyAttached(
+            raise qubes.exc.DeviceAlreadyAttached(
                 f"Device {device} already attached to {device.attachment}"
             )
 
@@ -775,6 +776,7 @@ async def on_domain_start(self, vm, _event, **_kwargs):
     async def on_domain_shutdown(self, vm, _event, **_kwargs):
         # pylint: disable=unused-argument
         vm.fire_event("device-list-change:usb")
+        utils.device_list_change(self, {}, vm, None, USBDevice)
 
     @qubes.ext.handler("qubes-close", system=True)
     def on_qubes_close(self, app, event):