diff --git a/Meshtastic/Views/Nodes/NodeList.swift b/Meshtastic/Views/Nodes/NodeList.swift
index 21fd6fa5..82522223 100644
--- a/Meshtastic/Views/Nodes/NodeList.swift
+++ b/Meshtastic/Views/Nodes/NodeList.swift
@@ -284,6 +284,9 @@ struct NodeList: View {
 						// Make sure the ZStack passes through accessibility to the ConnectedDevice component
 						.accessibilityElement(children: .contain)
 					)
+					.onDisappear {
+						router.navigationState.nodeListSelectedNodeNum = nil
+					}
 				}
 			 } else {
 				ContentUnavailableView("Select Node", systemImage: "flipphone")