diff --git a/Meshtastic/Views/Nodes/NodeDetail.swift b/Meshtastic/Views/Nodes/NodeDetail.swift
index c095fd4d..d5495f6a 100644
--- a/Meshtastic/Views/Nodes/NodeDetail.swift
+++ b/Meshtastic/Views/Nodes/NodeDetail.swift
@@ -393,12 +393,11 @@ struct NodeDetail: View {
 
 							HStack {
 								let connectedNode = getNodeInfo(id: bleManager.connectedPeripheral?.num ?? -1, context: context)
-								if node.metadata?.canShutdown ?? false || hwModelString == "RAK4631" {// node.metadata?.hwModel ?? "UNSET" == "RAK4631"  {
+								if node.metadata?.canShutdown ?? false {
 
 									Button(action: {
 										showingShutdownConfirm = true
 									}) {
-
 										Label("Power Off", systemImage: "power")
 									}
 									.buttonStyle(.bordered)
diff --git a/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift b/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift
index 389f37de..757400d1 100644
--- a/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift
+++ b/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift
@@ -84,7 +84,7 @@ struct TelemetryConfig: View {
 					.toggleStyle(SwitchToggleStyle(tint: .accentColor))
 				}
 			}
-			.disabled(self.bleManager.connectedPeripheral == nil || node?.positionConfig == nil)
+			.disabled(self.bleManager.connectedPeripheral == nil || node?.telemetryConfig == nil)
 			Button {
 				isPresentingSaveConfirm = true
 			} label: {