diff --git a/src/components/UI/Sidebar/sidebarButton.tsx b/src/components/UI/Sidebar/sidebarButton.tsx
index 5a5efe074..7a4ce2db9 100644
--- a/src/components/UI/Sidebar/sidebarButton.tsx
+++ b/src/components/UI/Sidebar/sidebarButton.tsx
@@ -6,7 +6,7 @@ export interface SidebarButtonProps {
   count?: number;
   active?: boolean;
   Icon?: LucideIcon;
-  element?;
+  children: React.ReactNode;
   onClick?: () => void;
   disabled?: boolean;
 }
@@ -16,7 +16,7 @@ export const SidebarButton = ({
   active,
   Icon,
   count,
-  element,
+  children,
   onClick,
   disabled = false,
 }: SidebarButtonProps) => (
@@ -28,8 +28,8 @@ export const SidebarButton = ({
     disabled={disabled}
   >
     {Icon && <Icon size={16} />}
-    {element && element}
+    {children && children}
     <span className="flex flex-1 justify-start shrink-0">{label}</span>
-    {count > 0 && !active && <div className="justify-end text-white rounded-[20%] px-[2%] bg-[rgb(195,0,0)]">{count}</div>}
+    {count && count > 0 && !active && <div className="justify-end text-white rounded-[20%] px-[2%] bg-[rgb(195,0,0)]">{count}</div>}
   </Button>
 );
diff --git a/src/core/subscriptions.ts b/src/core/subscriptions.ts
index 279e50583..822efafaa 100644
--- a/src/core/subscriptions.ts
+++ b/src/core/subscriptions.ts
@@ -1,6 +1,6 @@
 import type { Device } from "@core/stores/deviceStore.ts";
 import { MeshDevice, Protobuf } from "@meshtastic/core";
-import type { MessageStore } from "@core/stores/messageStore.ts";
+import { MessageType, type MessageStore } from "@core/stores/messageStore.ts";
 import PacketToMessageDTO from "@core/dto/PacketToMessageDTO.ts";
 
 export const subscribeAll = (