diff --git a/lib/features/devices/model/device_info_model.dart b/lib/features/devices/model/device_info_model.dart
index b3c1653..583ef69 100644
--- a/lib/features/devices/model/device_info_model.dart
+++ b/lib/features/devices/model/device_info_model.dart
@@ -77,7 +77,7 @@ class DeviceInfoModel {
       uuid: json['uuid'],
       productUuid: json['productUuid'],
       productType: json['productType'],
-      permissionType: json['permissionType'],
+      permissionType: json['permissionType'] ?? '',
       macAddress: json['macAddress'],
       subspace: Subspace.fromJson(json['subspace']),
     );
diff --git a/lib/services/api/devices_api.dart b/lib/services/api/devices_api.dart
index eea5dcf..e8f4196 100644
--- a/lib/services/api/devices_api.dart
+++ b/lib/services/api/devices_api.dart
@@ -102,7 +102,8 @@ class DevicesAPI {
   static Future<Map<String, dynamic>> getPowerClampStatus(
       String deviceId) async {
     final response = await _httpService.get(
-      path: ApiEndpoints.deviceFunctionsStatus.replaceAll('{deviceUuid}', deviceId),
+      path: ApiEndpoints.deviceFunctionsStatus
+          .replaceAll('{deviceUuid}', deviceId),
       showServerMessage: false,
       expectedResponseModel: (json) {
         return json;
@@ -144,7 +145,7 @@ class DevicesAPI {
         path: ApiEndpoints.deviceScene.replaceAll('{deviceUuid}', deviceId),
         showServerMessage: false,
         expectedResponseModel: (json) {
-          return json;
+          return json['data'];
         });
     return response;
   }
@@ -592,11 +593,12 @@ class DevicesAPI {
             return <DeviceModel>[];
           }
           final result = <DeviceModel>[];
-          for (final device in data) { 
-              final mappedDevice = DeviceModel.fromJson(device);
-              if (mappedDevice.productType?.name != DeviceType.FlushMountedSensor.name) {
-                result.add(mappedDevice);
-              }
+          for (final device in data) {
+            final mappedDevice = DeviceModel.fromJson(device);
+            if (mappedDevice.productType?.name !=
+                DeviceType.FlushMountedSensor.name) {
+              result.add(mappedDevice);
+            }
           }
           return result;
         },