diff --git a/network/message/handler.go b/network/message/handler.go
index 93f6005a370e56f0d842206f093569658d712c45..4a665a5d415d0801d180cf5a40b3ad6b45b20511 100644
--- a/network/message/handler.go
+++ b/network/message/handler.go
@@ -112,12 +112,11 @@ func (m *Manager) handleMessage(ecrMsg format.Message, identity reception.Identi
 	xxMsg, ok := m.partitioner.HandlePartition(sender, encTy, msg.GetContents(),
 		relationshipFingerprint)
 
-	//Set the identities
-	xxMsg.RecipientID = identity.Source
-	xxMsg.EphemeralID = identity.EphId
-
 	// If the reception completed a message, hear it on the switchboard
 	if ok {
+		//Set the identities
+		xxMsg.RecipientID = identity.Source
+		xxMsg.EphemeralID = identity.EphId
 		xxMsg.Encryption = encTy
 		if xxMsg.MessageType == message.Raw {
 			jww.WARN.Panicf("Recieved a message of type 'Raw' from %s."+