diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/MutableTransportKeys.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/MutableTransportKeys.java
index ebaef9973..192c76415 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/transport/MutableTransportKeys.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/MutableTransportKeys.java
@@ -1,9 +1,11 @@
 package org.briarproject.bramble.transport;
 
+import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.transport.TransportKeys;
 
+import javax.annotation.Nullable;
 import javax.annotation.concurrent.NotThreadSafe;
 
 @NotThreadSafe
@@ -13,6 +15,9 @@ class MutableTransportKeys {
 	private final TransportId transportId;
 	private final MutableIncomingKeys inPrev, inCurr, inNext;
 	private final MutableOutgoingKeys outCurr;
+	@Nullable
+	private final SecretKey rootKey;
+	private final boolean alice;
 
 	MutableTransportKeys(TransportKeys k) {
 		transportId = k.getTransportId();
@@ -20,11 +25,24 @@ class MutableTransportKeys {
 		inCurr = new MutableIncomingKeys(k.getCurrentIncomingKeys());
 		inNext = new MutableIncomingKeys(k.getNextIncomingKeys());
 		outCurr = new MutableOutgoingKeys(k.getCurrentOutgoingKeys());
+		if (k.isHandshakeMode()) {
+			rootKey = k.getRootKey();
+			alice = k.isAlice();
+		} else {
+			rootKey = null;
+			alice = false;
+		}
 	}
 
 	TransportKeys snapshot() {
-		return new TransportKeys(transportId, inPrev.snapshot(),
-				inCurr.snapshot(), inNext.snapshot(), outCurr.snapshot());
+		if (rootKey == null) {
+			return new TransportKeys(transportId, inPrev.snapshot(),
+					inCurr.snapshot(), inNext.snapshot(), outCurr.snapshot());
+		} else {
+			return new TransportKeys(transportId, inPrev.snapshot(),
+					inCurr.snapshot(), inNext.snapshot(), outCurr.snapshot(),
+					rootKey, alice);
+		}
 	}
 
 	TransportId getTransportId() {
@@ -46,4 +64,18 @@ class MutableTransportKeys {
 	MutableOutgoingKeys getCurrentOutgoingKeys() {
 		return outCurr;
 	}
+
+	boolean isHandshakeMode() {
+		return rootKey != null;
+	}
+
+	SecretKey getRootKey() {
+		if (rootKey == null) throw new UnsupportedOperationException();
+		return rootKey;
+	}
+
+	boolean isAlice() {
+		if (rootKey == null) throw new UnsupportedOperationException();
+		return alice;
+	}
 }