diff --git a/services/BedHardwareMQTT.ts b/services/BedHardwareMQTT.ts
index 29ba4a4..0689e77 100644
--- a/services/BedHardwareMQTT.ts
+++ b/services/BedHardwareMQTT.ts
@@ -84,20 +84,19 @@ export class BedHardwareMQTT extends EventEmitter implements IBedHardware {
           
           this.pinStates.set(data.pin, pinState);
           this.emit('pinInitialized', pinState);
-        }
-      } else if (topic === this.topics.pinChange) {
-        if (data.pin !== undefined && data.previousState !== undefined && data.currentState !== undefined) {
+        }      } else if (topic === this.topics.pinChange) {
+        if (data.pin !== undefined && data.previousValue !== undefined && data.currentValue !== undefined) {
           const pinChange: PinChange = {
             pin: data.pin,
-            previousState: data.previousState,
-            currentState: data.currentState,
+            previousState: data.previousValue,
+            currentState: data.currentValue,
             timestamp: new Date(data.timestamp || Date.now())
           };
           
           // Update stored pin state
           const pinState: PinState = {
             pin: data.pin,
-            state: data.currentState,
+            state: data.currentValue,
             name: data.name || `PIN${data.pin}`,
             timestamp: new Date(data.timestamp || Date.now())
           };