diff --git a/applications/minotari_console_wallet/src/ui/state/app_state.rs b/applications/minotari_console_wallet/src/ui/state/app_state.rs
index b392db494d..9c068f968d 100644
--- a/applications/minotari_console_wallet/src/ui/state/app_state.rs
+++ b/applications/minotari_console_wallet/src/ui/state/app_state.rs
@@ -1056,6 +1056,14 @@ impl AppStateInner {
         self.data.base_node_previous = self.data.base_node_selected.clone();
         self.data.base_node_selected = peer.clone();
         self.data.base_node_peer_custom = Some(peer.clone());
+        if let Some(pos) = self
+            .data
+            .base_node_list
+            .iter()
+            .position(|(s, _)| s == "Custom Base Node")
+        {
+            self.data.base_node_list.remove(pos);
+        }
         self.data
             .base_node_list
             .insert(0, ("Custom Base Node".to_string(), peer.clone()));