diff --git a/qubes/ext/block.py b/qubes/ext/block.py
index d441dbc7d..14f98ac10 100644
--- a/qubes/ext/block.py
+++ b/qubes/ext/block.py
@@ -646,10 +646,10 @@ async def on_domain_shutdown(self, vm, event, **_kwargs):
             new_cache[domain.name] = {}
             if domain == vm:
                 for dev_id, front_vm in self.devices_cache[domain.name].items():
-                    if front_vm is None:
-                        continue
                     dev = BlockDevice(Port(vm, dev_id, "block"))
                     vm.fire_event("device-removed:block", port=dev.port)
+                    if front_vm is None:
+                        continue
                     await self.detach_and_notify(front_vm, dev.port)
                 continue
             for dev_id, front_vm in self.devices_cache[domain.name].items():