diff --git a/MeshtasticClient/Views/Map/MapViewModule.swift b/MeshtasticClient/Views/Map/MapViewModule.swift
index 570da564..1cbb43c0 100644
--- a/MeshtasticClient/Views/Map/MapViewModule.swift
+++ b/MeshtasticClient/Views/Map/MapViewModule.swift
@@ -11,7 +11,9 @@ import CoreData
 #if canImport(MapKit) && canImport(UIKit)
 public struct MapView: UIViewRepresentable {
 
-	@Environment(\.managedObjectContext) var context
+	//@Environment(\.managedObjectContext) var context
+	
+	var context: NSManagedObjectContext?
 	
 	//@Binding private var region: MKCoordinateRegion
 	
@@ -60,7 +62,8 @@ public struct MapView: UIViewRepresentable {
 		userLocation: Binding<CLLocationCoordinate2D?> = .constant(nil),
 		//annotations: [MKPointAnnotation] = [],
 		//locationNodes: [NodeInfoEntity] = [],
-		overlays: [Overlay] = []
+		overlays: [Overlay] = [],
+		context: NSManagedObjectContext? = nil
 	) {
 		//self._region = region
 		
diff --git a/MeshtasticClient/Views/Nodes/NodeMap.swift b/MeshtasticClient/Views/Nodes/NodeMap.swift
index 280fb2d0..be4918e1 100644
--- a/MeshtasticClient/Views/Nodes/NodeMap.swift
+++ b/MeshtasticClient/Views/Nodes/NodeMap.swift
@@ -108,14 +108,16 @@ struct NodeMap: View {
 					userLocation: self.$userLocation,
 					//annotations: self.annotations,
 					//locationNodes: self.locationNodes.map({ nodeinfo in return nodeinfo }),
-					overlays: self.overlays
+					overlays: self.overlays,
+					context: self.context
 				)
-				
+
                .frame(maxHeight: .infinity)
                .ignoresSafeArea(.all, edges: [.leading, .trailing])
             }
             .navigationTitle("Mesh Map")
             .navigationBarTitleDisplayMode(.inline)
+			
 			.navigationBarItems(trailing:
 
 			ZStack {