diff --git a/network/message/handler.go b/network/message/handler.go
index 7aa63e6ad85293b57d716d9bdf894736a3fd4bed..1c89d9a53c68beffc9f44d0a3b83994949dfdf3f 100644
--- a/network/message/handler.go
+++ b/network/message/handler.go
@@ -111,15 +111,17 @@ func (m *Manager) handleMessage(ecrMsg format.Message, bundle Bundle, edge *edge
 		// and add it to garbled messages to be handled later
 		msg = ecrMsg
 		raw := message.Receive{
-			Payload:        msg.Marshal(),
-			MessageType:    message.Raw,
-			Sender:         &id.ID{},
-			EphemeralID:    identity.EphId,
-			Timestamp:      time.Time{},
-			Encryption:     message.None,
-			RecipientID:    identity.Source,
-			RoundId:        id.Round(bundle.RoundInfo.ID),
-			RoundTimestamp: time.Unix(0, int64(bundle.RoundInfo.Timestamps[states.QUEUED])),
+			Payload:     msg.Marshal(),
+			MessageType: message.Raw,
+			Sender:      &id.ID{},
+			EphemeralID: identity.EphId,
+			Timestamp:   time.Time{},
+			Encryption:  message.None,
+			RecipientID: identity.Source,
+			RoundId:     id.Round(bundle.RoundInfo.ID),
+			// We use PRECOMPUTING here because all Rounds have that timestamp available to them
+			// QUEUED can be missing sometimes and cause a lot of hidden problems further down the line
+			RoundTimestamp: time.Unix(0, int64(bundle.RoundInfo.Timestamps[states.PRECOMPUTING])),
 		}
 		im := fmt.Sprintf("Received message of type Garbled/RAW: keyFP: %v, round: %d, "+
 			"msgDigest: %s", msg.GetKeyFP(), bundle.Round, msg.Digest())
diff --git a/network/rounds/historical.go b/network/rounds/historical.go
index 85f53e0f3d77b156b33ce6cdbc3f15f3e52c418b..39fd0b318d19db8613e57d2a9b335cc7e24577a3 100644
--- a/network/rounds/historical.go
+++ b/network/rounds/historical.go
@@ -13,7 +13,6 @@ import (
 	"gitlab.com/elixxir/client/stoppable"
 	"gitlab.com/elixxir/client/storage/reception"
 	pb "gitlab.com/elixxir/comms/mixmessages"
-	"gitlab.com/elixxir/primitives/states"
 	"gitlab.com/xx_network/comms/connect"
 	"gitlab.com/xx_network/primitives/id"
 	"time"
@@ -123,7 +122,7 @@ func (m *Manager) processHistoricalRounds(comm historicalRoundsComms, stop *stop
 			// The interface has missing returns returned as nil, such roundRequests
 			// need to be removes as processing so the network follower will
 			// pick them up in the future.
-			if roundInfo == nil || roundInfo.State != uint32(states.COMPLETED) {
+			if roundInfo == nil {
 				var errMsg string
 				roundRequests[i].numAttempts++
 				if roundRequests[i].numAttempts == m.params.MaxHistoricalRoundsRetries {