diff --git a/src/modules/device/commands/service.ts b/src/modules/device/commands/service.ts
index ad0dff0..3034a6a 100644
--- a/src/modules/device/commands/service.ts
+++ b/src/modules/device/commands/service.ts
@@ -10,14 +10,14 @@ export default abstract class CommandService {
     try {
       const topicData = `${body.merchantName}/${body.floorName}_${body.unitNumber}-${body.deviceName}-${body.roomName}-${body.deviceType}-${body.commandType}-${body.towerNumber}`
 
-      if (topicData == 'SAVY/01_L2-L-LV-S-C-T1' && ['On', 'Off'].includes(body.payload.action)) {
+      if (topicData == 'SAVY/L2_01-L-LV-S-C-T1' && ['On', 'Off'].includes(body.payload.action)) {
         return {
           status: 'success',
           message: 'Command accepted',
           receivedAt: new Date().toISOString(),
         }
       }
-      if (topicData == 'SAVY/01_L2-BL-LV-S-C-T1' && ['Open', 'Close'].includes(body.payload.action)) {
+      if (topicData == 'SAVY/L2_01-BL-LV-S-C-T1' && ['Open', 'Close'].includes(body.payload.action)) {
         return {
           status: 'success',
           message: 'Command accepted',
diff --git a/src/modules/device/queries/service.ts b/src/modules/device/queries/service.ts
index ba07f99..8708a90 100644
--- a/src/modules/device/queries/service.ts
+++ b/src/modules/device/queries/service.ts
@@ -53,7 +53,6 @@ export default abstract class QueryService {
         },
       }
     }
-
     const deviceData = await queryDeviceStatus(topic)
 
     if (deviceData) {