diff --git a/Meshtastic/Persistence/UpdateCoreData.swift b/Meshtastic/Persistence/UpdateCoreData.swift
index b2673477..d06c0219 100644
--- a/Meshtastic/Persistence/UpdateCoreData.swift
+++ b/Meshtastic/Persistence/UpdateCoreData.swift
@@ -227,6 +227,7 @@ func upsertNodeInfoPacket (packet: MeshPacket, context: NSManagedObjectContext)
 			let myInfoEntity = MyInfoEntity(context: context)
 			myInfoEntity.myNodeNum = Int64(packet.from)
 			myInfoEntity.rebootCount = 0
+			newNode.myInfo = myInfoEntity
 			do {
 				try context.save()
 				Logger.data.info("💾 [NodeInfo] Saved a NodeInfo for node number: \(packet.from.toHex(), privacy: .public)")
@@ -236,7 +237,6 @@ func upsertNodeInfoPacket (packet: MeshPacket, context: NSManagedObjectContext)
 				let nsError = error as NSError
 				Logger.data.error("💥 [MyInfoEntity] Error Inserting New Core Data: \(nsError, privacy: .public)")
 			}
-			newNode.myInfo = myInfoEntity
 
 		} else {
 			// Update an existing node