diff --git a/Meshtastic/Extensions/CoreData/MessageEntityExtension.swift b/Meshtastic/Extensions/CoreData/MessageEntityExtension.swift
index a7ba0e78..db3a0899 100644
--- a/Meshtastic/Extensions/CoreData/MessageEntityExtension.swift
+++ b/Meshtastic/Extensions/CoreData/MessageEntityExtension.swift
@@ -14,7 +14,7 @@ import SwiftUI
 
 extension MessageEntity {
 	var timestamp: Date {
-		let time = messageTimestamp <= 0 ? receivedTimestamp : messageTimestamp
+		let time = messageTimestamp 
 		return Date(timeIntervalSince1970: TimeInterval(time))
 	}
 
diff --git a/Meshtastic/Helpers/MeshPackets.swift b/Meshtastic/Helpers/MeshPackets.swift
index 0d6f5917..bb3687b5 100644
--- a/Meshtastic/Helpers/MeshPackets.swift
+++ b/Meshtastic/Helpers/MeshPackets.swift
@@ -795,7 +795,6 @@ func textMessageAppPacket(
 			let newMessage = MessageEntity(context: context)
 			newMessage.messageId = Int64(packet.id)
 			newMessage.messageTimestamp = Int32(bitPattern: packet.rxTime)
-			newMessage.receivedTimestamp = Int32(Date().timeIntervalSince1970)
 			newMessage.receivedACK = false
 			newMessage.snr = packet.rxSnr
 			newMessage.rssi = packet.rxRssi
diff --git a/Meshtastic/Meshtastic.xcdatamodeld/MeshtasticDataModelV 41.xcdatamodel/contents b/Meshtastic/Meshtastic.xcdatamodeld/MeshtasticDataModelV 41.xcdatamodel/contents
index 36f6fabd..55eccab7 100644
--- a/Meshtastic/Meshtastic.xcdatamodeld/MeshtasticDataModelV 41.xcdatamodel/contents	
+++ b/Meshtastic/Meshtastic.xcdatamodeld/MeshtasticDataModelV 41.xcdatamodel/contents	
@@ -159,7 +159,6 @@
         <attribute name="read" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
         <attribute name="realACK" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
         <attribute name="receivedACK" attributeType="Boolean" usesScalarValueType="YES"/>
-        <attribute name="receivedTimestamp" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="replyID" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="rssi" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="snr" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
diff --git a/Meshtastic/Persistence/QueryCoreData.swift b/Meshtastic/Persistence/QueryCoreData.swift
index f023eb9b..55889764 100644
--- a/Meshtastic/Persistence/QueryCoreData.swift
+++ b/Meshtastic/Persistence/QueryCoreData.swift
@@ -29,7 +29,7 @@ public func getStoreAndForwardMessageIds(seconds: Int, context: NSManagedObjectC
 	let fetchMessagesRequest = MessageEntity.fetchRequest()
 	let timeRange = Calendar.current.date(byAdding: .minute, value: time, to: Date())
 	let milleseconds = Int32(timeRange?.timeIntervalSince1970 ?? 0)
-	fetchMessagesRequest.predicate =  NSPredicate(format: "receivedTimestamp >= %d", milleseconds)
+	fetchMessagesRequest.predicate =  NSPredicate(format: "messageTimestamp >= %d", milleseconds)
 
 	do {
 		let fetchedMessages = try context.fetch(fetchMessagesRequest)