diff --git a/qubes/device_protocol.py b/qubes/device_protocol.py
index cd2bf61b4..54bff7979 100644
--- a/qubes/device_protocol.py
+++ b/qubes/device_protocol.py
@@ -1289,7 +1289,7 @@ def devices(self) -> List[DeviceInfo]:
             dev = self.backend_domain.devices[self.devclass][self.port_id]
             if (
                 isinstance(dev, UnknownDevice)
-                or dev.device_id == self.device_id
+                or self.device_id in (dev.device_id, "*")
             ):
                 return [dev]
         result = []
diff --git a/qubes/vm/qubesvm.py b/qubes/vm/qubesvm.py
index c6c9f5fde..b7b2870bd 100644
--- a/qubes/vm/qubesvm.py
+++ b/qubes/vm/qubesvm.py
@@ -1178,9 +1178,8 @@ async def start(self, start_guid=True, notify_function=None,
             qmemman_client = None
             try:
                 for devclass in self.devices:
-                    for ass in self.devices[devclass].get_assigned_devices():
-                        if not ass.required:
-                            continue
+                    for ass in self.devices[devclass].get_assigned_devices(
+                            required_only=True):
                         for device in ass.devices:
                             if not isinstance(
                                 device, qubes.device_protocol.UnknownDevice