diff --git a/bundles/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/commandclass/ZWaveWakeUpCommandClass.java b/bundles/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/commandclass/ZWaveWakeUpCommandClass.java
index 419227f7cce..24b5356b82d 100644
--- a/bundles/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/commandclass/ZWaveWakeUpCommandClass.java
+++ b/bundles/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/commandclass/ZWaveWakeUpCommandClass.java
@@ -240,8 +240,8 @@ public boolean processOutgoingWakeupMessage(SerialMessage serialMessage) {
 			return false;
 		}
 		if (this.wakeUpQueue.contains(serialMessage)) {
-			logger.debug("NODE {}: Message already on the wake-up queue. Discarding.", this.getNode().getNodeId());
-			return false;
+			logger.debug("NODE {}: Message already on the wake-up queue. Removing original.", this.getNode().getNodeId());
+			this.wakeUpQueue.remove(serialMessage);
 		}
 
 		logger.debug("NODE {}: Putting message in wakeup queue.", this.getNode().getNodeId());