diff --git a/src/device/services/device.service.ts b/src/device/services/device.service.ts
index 0216cc7..15276d9 100644
--- a/src/device/services/device.service.ts
+++ b/src/device/services/device.service.ts
@@ -82,11 +82,15 @@ export class DeviceService {
     deviceUuid: string,
     withProductDevice: boolean = true,
   ) {
-    return await this.deviceRepository.findOne({
-      where: {
-        uuid: deviceUuid,
-      },
-      ...(withProductDevice && { relations: ['productDevice'] }),
+    const relations = ['subspace'];
+
+    if (withProductDevice) {
+      relations.push('productDevice');
+    }
+
+    return this.deviceRepository.findOne({
+      where: { uuid: deviceUuid },
+      relations,
     });
   }
 
@@ -568,6 +572,7 @@ export class DeviceService {
         productType: deviceDetails.productDevice.prodType,
         permissionType: userDevicePermission,
         macAddress: macAddress.mac,
+        subspace: deviceDetails.subspace ? deviceDetails.subspace : {},
       };
     } catch (error) {
       throw new HttpException(