diff --git a/lib/connector/meshcore_connector.dart b/lib/connector/meshcore_connector.dart
index 228fc39..108ccc7 100644
--- a/lib/connector/meshcore_connector.dart
+++ b/lib/connector/meshcore_connector.dart
@@ -3903,7 +3903,9 @@ class MeshCoreConnector extends ChangeNotifier {
     if (mlTimeout != null) {
       if (pathLength < 0) {
         // Flood: trust ML, only enforce firmware formula as floor
-        return mlTimeout.clamp(physicsMin, mlTimeout);
+        if (mlTimeout < physicsMin) {
+          return physicsMin;
+        }
       }
       return mlTimeout.clamp(physicsMin, physicsMax);
     }
diff --git a/lib/screens/channel_message_path_screen.dart b/lib/screens/channel_message_path_screen.dart
index 0eb2c22..53769d4 100644
--- a/lib/screens/channel_message_path_screen.dart
+++ b/lib/screens/channel_message_path_screen.dart
@@ -879,7 +879,7 @@ List<_PathHop> _buildPathHops(
       previousPosition = resolvedPosition;
     }
     // If the best candidate is much farther than the previous hop, it's likely not the correct match.
-    if (lastDistance + bestDistance > 70000 &&
+    if (lastDistance + bestDistance > 50000 &&
         candidates != null &&
         candidates.isNotEmpty) {
       i--;
diff --git a/lib/screens/neighbors_screen.dart b/lib/screens/neighbors_screen.dart
index f4c1673..7286eb0 100644
--- a/lib/screens/neighbors_screen.dart
+++ b/lib/screens/neighbors_screen.dart
@@ -142,7 +142,7 @@ class _NeighborsScreenState extends State<NeighborsScreen> {
 
   void _handleNeighborsResponse(MeshCoreConnector connector, Uint8List frame) {
     final buffer = BufferReader(frame);
-    final contacts = connector.allContacts;
+    final contacts = connector.allContactsUnfiltered;
     try {
       final neighborCount = buffer.readUInt16LE();
       final parsedNeighbors = parseNeighborsData(buffer, buffer.readUInt16LE());