diff --git a/src/modules/device/queries/service.ts b/src/modules/device/queries/service.ts
index 45165f3..e929c26 100644
--- a/src/modules/device/queries/service.ts
+++ b/src/modules/device/queries/service.ts
@@ -32,7 +32,7 @@ export default abstract class QueryService {
 
     // TODO: Check nonce for replay attack when DB is implemented
 
-    const topic = `${query.merchantName}/${query.floorName}_${query.unitNumber}-${query.deviceName}-${query.roomName}-${query.deviceType}-${query.commandType}-${query.towerNumber}`
+    const topic = `${query.merchantName}/${query.floorName}_${query.unitNumber}-${query.deviceName}-${query.roomName}-${query.deviceType}-S-${query.towerNumber}`
 
     const deviceData = await queryDeviceStatus(topic)