diff --git a/src/Packet.cpp b/src/Packet.cpp
index 71f89c1f..e338b60d 100644
--- a/src/Packet.cpp
+++ b/src/Packet.cpp
@@ -14,6 +14,9 @@ void Packet::calculatePacketHash(uint8_t* hash) const {
   SHA256 sha;
   uint8_t t = getPayloadType();
   sha.update(&t, 1);
+  if (t == PAYLOAD_TYPE_TRACE) {
+    sha.update(&path_len, sizeof(path_len));   // CAVEAT: TRACE packets can revisit same node on return path
+  }
   sha.update(payload, payload_len);
   sha.finalize(hash, MAX_HASH_SIZE);
 }