diff --git a/packages/web/src/core/stores/nodeDBStore/index.ts b/packages/web/src/core/stores/nodeDBStore/index.ts
index 14bc40a6..58100a5d 100644
--- a/packages/web/src/core/stores/nodeDBStore/index.ts
+++ b/packages/web/src/core/stores/nodeDBStore/index.ts
@@ -41,7 +41,7 @@ export interface NodeDB {
     filter?: (node: Protobuf.Mesh.NodeInfo) => boolean,
     includeSelf?: boolean,
   ) => Protobuf.Mesh.NodeInfo[];
-  getMyNode: () => Protobuf.Mesh.NodeInfo | undefined;
+  getMyNode: () => Protobuf.Mesh.NodeInfo;
 
   getNodeError: (nodeNum: number) => NodeError | undefined;
   hasNodeError: (nodeNum: number) => boolean;
diff --git a/packages/web/src/pages/Messages.tsx b/packages/web/src/pages/Messages.tsx
index 59370612..fb993761 100644
--- a/packages/web/src/pages/Messages.tsx
+++ b/packages/web/src/pages/Messages.tsx
@@ -100,7 +100,7 @@ export const MessagesPage = () => {
         longName.includes(lowerCaseSearchTerm) ||
         shortName.includes(lowerCaseSearchTerm)
       );
-    })
+    }, true)
       .map((node: Protobuf.Mesh.NodeInfo) => ({
         ...node,
         unreadCount: getUnreadCount(node.num) ?? 0,
@@ -130,7 +130,7 @@ export const MessagesPage = () => {
           true,
           channelValue,
         );
-        if (messageId !== undefined) {
+        if (messageId !== undefined && getMyNode() !== undefined) {
           if (chatType === MessageType.Broadcast) {
             setMessageState({
               type: MessageType.Broadcast,
diff --git a/packages/web/src/pages/Nodes/index.tsx b/packages/web/src/pages/Nodes/index.tsx
index cb7d0b6e..7be9a7b8 100644
--- a/packages/web/src/pages/Nodes/index.tsx
+++ b/packages/web/src/pages/Nodes/index.tsx
@@ -67,7 +67,7 @@ const NodesPage = (): JSX.Element => {
   // subscribe to actual data (nodes array) and to nodeErrors ref for badge updates
   const { nodes: filteredNodes, hasNodeError } = useNodeDB(
     (db) => ({
-      nodes: db.getNodes(predicate, false),
+      nodes: db.getNodes(predicate, true),
       hasNodeError: db.hasNodeError,
       _errorsRef: db.nodeErrors, // include the Map ref so UI also re-renders on error changes
     }),