diff --git a/Meshtastic/Extensions/CoreData/PositionEntityExtension.swift b/Meshtastic/Extensions/CoreData/PositionEntityExtension.swift
index 44777bb3..20fbbd35 100644
--- a/Meshtastic/Extensions/CoreData/PositionEntityExtension.swift
+++ b/Meshtastic/Extensions/CoreData/PositionEntityExtension.swift
@@ -14,7 +14,7 @@ extension PositionEntity {
 	
 	static func allPositionsFetchRequest() -> NSFetchRequest<PositionEntity> {
 		let request: NSFetchRequest<PositionEntity> = PositionEntity.fetchRequest()
-		//request.fetchLimit = 200
+		request.fetchLimit = 300
 		//request.fetchBatchSize = 1
 		request.returnsObjectsAsFaults = false
 		request.includesSubentities = true
diff --git a/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift b/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift
index 3d228ad3..cfcaa930 100644
--- a/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift
+++ b/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift
@@ -276,6 +276,9 @@ struct MQTTConfig: View {
 			}
 		}
 		.onChange(of: proxyToClientEnabled) { newProxyToClientEnabled in
+			if newProxyToClientEnabled {
+				jsonEnabled = false
+			}
 			if node != nil && node?.mqttConfig != nil {
 				if newProxyToClientEnabled != node!.mqttConfig!.proxyToClientEnabled { hasChanges = true }
 				if newProxyToClientEnabled {
@@ -289,6 +292,9 @@ struct MQTTConfig: View {
 			}
 		}
 		.onChange(of: jsonEnabled) { newJsonEnabled in
+			if newJsonEnabled {
+				proxyToClientEnabled = false
+			}
 			if node != nil && node?.mqttConfig != nil {
 				if newJsonEnabled != node!.mqttConfig!.jsonEnabled { hasChanges = true }
 			}