diff --git a/fdbrpc/FlowTransport.actor.cpp b/fdbrpc/FlowTransport.actor.cpp
index 48ec16a936..728d422734 100644
--- a/fdbrpc/FlowTransport.actor.cpp
+++ b/fdbrpc/FlowTransport.actor.cpp
@@ -124,7 +124,7 @@ const Endpoint& EndpointMap::insert( NetworkAddressList localAddresses, std::vec
 	UID base = deterministicRandom()->randomUniqueID();
 	for(uint64_t i=0; i<streams.size(); i++) {
 		int index = adjacentStart+i;
-		uint64_t first = (base.first()+(i<<56)) | TOKEN_STREAM_FLAG;
+		uint64_t first = (base.first()+(i<<32)) | TOKEN_STREAM_FLAG;
 		streams[i].first->setEndpoint( Endpoint( localAddresses, UID( first, (base.second()&0xffffffff00000000LL) | index) ) );
 		data[index].token() = Endpoint::Token( first, (base.second()&0xffffffff00000000LL) | static_cast<uint32_t>(streams[i].second) );
 		data[index].receiver = (NetworkMessageReceiver*) streams[i].first;
diff --git a/fdbrpc/FlowTransport.h b/fdbrpc/FlowTransport.h
index 521ff3f63f..6c9250cedb 100644
--- a/fdbrpc/FlowTransport.h
+++ b/fdbrpc/FlowTransport.h
@@ -68,7 +68,7 @@ public:
 	Endpoint getAdjustedEndpoint( uint32_t index ) {
 		uint32_t newIndex = token.second();
 		newIndex += index;
-		return Endpoint( addresses, UID(token.first()+(uint64_t(index)<<56), (token.second()&0xffffffff00000000LL) | newIndex) );
+		return Endpoint( addresses, UID(token.first()+(uint64_t(index)<<32), (token.second()&0xffffffff00000000LL) | newIndex) );
 	}
 
 	bool operator == (Endpoint const& r) const {