diff --git a/src/blueapi/service/interface.py b/src/blueapi/service/interface.py
index 74a95291c..13c053b95 100644
--- a/src/blueapi/service/interface.py
+++ b/src/blueapi/service/interface.py
@@ -141,7 +141,10 @@ def get_devices() -> list[DeviceModel]:
 
 def get_device(name: str) -> DeviceModel:
     """Retrieve device by name from the BlueskyContext"""
-    return DeviceModel.from_device(context().devices[name])
+    if not (device := context().find_device(name)):
+        raise KeyError(name)
+
+    return DeviceModel.from_device(device)
 
 
 def submit_task(task_request: TaskRequest) -> str: