diff --git a/src/components/PageComponents/Messages/TraceRoute.tsx b/src/components/PageComponents/Messages/TraceRoute.tsx
index 4f160991..513810dc 100644
--- a/src/components/PageComponents/Messages/TraceRoute.tsx
+++ b/src/components/PageComponents/Messages/TraceRoute.tsx
@@ -2,8 +2,8 @@ import { useDevice } from "@app/core/stores/deviceStore.js";
 import type { Protobuf } from "@meshtastic/js";
 
 export interface TraceRouteProps {
-  from: Protobuf.Mesh.NodeInfo;
-  to: Protobuf.Mesh.NodeInfo;
+  from?: Protobuf.Mesh.NodeInfo;
+  to?: Protobuf.Mesh.NodeInfo;
   route: Array<number>;
 }
 
diff --git a/src/pages/Messages.tsx b/src/pages/Messages.tsx
index f1d58173..81d0cd15 100644
--- a/src/pages/Messages.tsx
+++ b/src/pages/Messages.tsx
@@ -82,7 +82,8 @@ export const MessagesPage = (): JSX.Element => {
           {
             icon: WaypointsIcon,
             async onClick() {
-              await connection?.traceRoute(nodes.get(activeChat)?.num).then(() =>
+              if (nodes.get(activeChat)?.num === undefined) return;
+              await connection?.traceRoute(nodes.get(activeChat)?.num!).then(() =>
                 toast({
                   title: `Traceroute sent.`,
                 }),