diff --git a/src/device/services/device.service.ts b/src/device/services/device.service.ts
index 35ac16a..2b37df8 100644
--- a/src/device/services/device.service.ts
+++ b/src/device/services/device.service.ts
@@ -37,6 +37,7 @@ import { SpaceRepository } from '@app/common/modules/space/repositories';
 import { DeviceStatusFirebaseService } from '@app/common/firebase/devices-status/services/devices-status.service';
 import { DeviceStatuses } from '@app/common/constants/device-status.enum';
 import { CommonErrorCodes } from '@app/common/constants/error-codes.enum';
+import { BatteryStatus } from '@app/common/constants/battery-status.enum';
 
 @Injectable()
 export class DeviceService {
@@ -64,7 +65,6 @@ export class DeviceService {
     return await this.deviceRepository.findOne({
       where: {
         uuid: deviceUuid,
-        isActive: true,
       },
       ...(withProductDevice && { relations: ['productDevice'] }),
     });
@@ -73,7 +73,6 @@ export class DeviceService {
     return await this.deviceRepository.findOne({
       where: {
         deviceTuyaUuid,
-        isActive: true,
       },
       relations: ['productDevice'],
     });
@@ -227,7 +226,6 @@ export class DeviceService {
       const device = await this.deviceRepository.findOne({
         where: {
           uuid: updateDeviceInRoomDto.deviceUuid,
-          isActive: true,
         },
         relations: ['spaceDevice', 'spaceDevice.parent'],
       });
@@ -655,7 +653,6 @@ export class DeviceService {
     const device = await this.deviceRepository.findOne({
       where: {
         uuid: deviceUuid,
-        isActive: true,
         permission: {
           userUuid: userUuid,
         },
@@ -843,7 +840,7 @@ export class DeviceService {
 
             const batteryStatus: any = doorLockInstructionsStatus.status.find(
               (status: any) =>
-                status.code === batteryStatus.RESIDUAL_ELECTRICITY,
+                status.code === BatteryStatus.RESIDUAL_ELECTRICITY,
             );
 
             if (batteryStatus) {
@@ -856,7 +853,7 @@ export class DeviceService {
               await this.getDevicesInstructionStatus(device.uuid);
 
             const batteryStatus: any = doorSensorInstructionsStatus.status.find(
-              (status: any) => status.code === batteryStatus.BATTERY_PERCENTAGE,
+              (status: any) => status.code === BatteryStatus.BATTERY_PERCENTAGE,
             );
 
             if (batteryStatus) {
@@ -869,7 +866,7 @@ export class DeviceService {
               await this.getDevicesInstructionStatus(device.uuid);
 
             const batteryStatus: any = doorSensorInstructionsStatus.status.find(
-              (status: any) => status.code === batteryStatus.BATTERY_PERCENTAGE,
+              (status: any) => status.code === BatteryStatus.BATTERY_PERCENTAGE,
             );
 
             if (batteryStatus) {