diff --git a/Meshtastic/Persistence/PositionEntityExtension.swift b/Meshtastic/Persistence/PositionEntityExtension.swift
index 7834b93b..ef67f4a7 100644
--- a/Meshtastic/Persistence/PositionEntityExtension.swift
+++ b/Meshtastic/Persistence/PositionEntityExtension.swift
@@ -42,7 +42,7 @@ extension PositionEntity {
 }
 
 extension PositionEntity: MKAnnotation {
-	public var coordinate: CLLocationCoordinate2D { nodeCoordinate! }
+	public var coordinate: CLLocationCoordinate2D { nodeCoordinate ?? CLLocationCoordinate2D(latitude: 0.0, longitude: 0.0) }
 	public var title: String? {  nodePosition?.user?.shortName ?? NSLocalizedString("unknown", comment: "Unknown") }
 	public var subtitle: String? {  time?.formatted() }
 }