diff --git a/qubes/ext/block.py b/qubes/ext/block.py
index 235c2ae2..209fb240 100644
--- a/qubes/ext/block.py
+++ b/qubes/ext/block.py
@@ -162,7 +162,9 @@ class BlockDeviceExtension(qubes.ext.Extension):
         if not vm.is_running():
             return
         if not vm.app.vmm.offline_mode:
-            yield self.device_get(vm, ident)
+            device_info = self.device_get(vm, ident)
+            if device_info:
+                yield device_info
 
     @qubes.ext.handler('device-list-attached:block')
     def on_device_list_attached(self, vm, event, **kwargs):