diff --git a/src/space/services/space-device.service.ts b/src/space/services/space-device.service.ts
index 773c7d5..df9597b 100644
--- a/src/space/services/space-device.service.ts
+++ b/src/space/services/space-device.service.ts
@@ -25,11 +25,8 @@ export class SpaceDeviceService {
       // Validate community, project, and fetch space including devices in a single query
       const space = await this.validationService.fetchSpaceDevices(spaceUuid);
 
-      if (!space || !space.devices?.length) {
-        throw new HttpException(
-          'The space does not contain any devices.',
-          HttpStatus.BAD_REQUEST,
-        );
+      if (!space) {
+        throw new HttpException('Space not found', HttpStatus.NOT_FOUND);
       }
 
       const spaceHierarchy =