diff --git a/server/src/hardware/protocol/loconet/messages.cpp b/server/src/hardware/protocol/loconet/messages.cpp
index 04eb671a..d60e9cff 100644
--- a/server/src/hardware/protocol/loconet/messages.cpp
+++ b/server/src/hardware/protocol/loconet/messages.cpp
@@ -118,6 +118,9 @@ void setSlot(Message& message, uint8_t slot)
 
 bool isValidResponse(const Message& request, const Message& response)
 {
+  if(response.opCode == OPC_LONG_ACK)
+    return request.opCode == static_cast<const LongAck&>(response).respondingOpCode();
+
   switch(request.opCode)
   {
     case OPC_UNLINK_SLOTS: