diff --git a/src/components/Dialog/NewDeviceDialog.tsx b/src/components/Dialog/NewDeviceDialog.tsx
index 871d557f..36ea8281 100644
--- a/src/components/Dialog/NewDeviceDialog.tsx
+++ b/src/components/Dialog/NewDeviceDialog.tsx
@@ -53,7 +53,7 @@ const links: { [key: string]: string } = {
 };
 
 const ErrorMessage = ({ missingFeatures }: FeatureErrorProps) => {
-  const { t, i18n } = useTranslation();
+  const { i18n } = useTranslation();
 
   const listFormatter = useMemo(
     () =>
@@ -158,7 +158,7 @@ export const NewDeviceDialog = ({
         <DialogHeader>
           <DialogTitle>{t("dialog_newDeviceDialog_title")}</DialogTitle>
         </DialogHeader>
-        <Tabs defaultValue={t("dialog_newDeviceDialog_tabLabelHttp")}>
+        <Tabs defaultValue="HTTP">
           <TabsList>
             {tabs.map((tab) => (
               <TabsTrigger key={tab.label} value={tab.label}>
@@ -169,7 +169,7 @@ export const NewDeviceDialog = ({
           {tabs.map((tab) => (
             <TabsContent key={tab.label} value={tab.label}>
               <fieldset disabled={tab.isDisabled}>
-                {(tab.label !== t("dialog_newDeviceDialog_tabLabelHttp") &&
+                {(tab.label !== "HTTP" &&
                     tab.isDisabled)
                   ? <ErrorMessage missingFeatures={unsupported} />
                   : null}
diff --git a/src/components/PageComponents/Messages/MessageItem.tsx b/src/components/PageComponents/Messages/MessageItem.tsx
index 1892c057..167059d7 100644
--- a/src/components/PageComponents/Messages/MessageItem.tsx
+++ b/src/components/PageComponents/Messages/MessageItem.tsx
@@ -17,6 +17,7 @@ import {
 } from "@core/stores/messageStore/index.ts";
 import { Protobuf, Types } from "@meshtastic/js";
 import { Message } from "@core/stores/messageStore/types.ts";
+import { useTranslation } from "react-i18next";
 // import { MessageActionsMenu } from "@components/PageComponents/Messages/MessageActionsMenu.tsx"; // Uncomment if needed later
 
 interface MessageStatusInfo {
@@ -81,6 +82,7 @@ interface MessageItemProps {
 export const MessageItem = ({ message }: MessageItemProps) => {
   const { getNode } = useDevice();
   const { getMyNodeNum } = useMessageStore();
+  const { i18n } = useTranslation();
 
   const messageUser: Protobuf.Mesh.NodeInfo | null | undefined = useMemo(() => {
     return message.from != null ? getNode(message.from) : null;
@@ -110,7 +112,7 @@ export const MessageItem = ({ message }: MessageItemProps) => {
     () => message.date ? new Date(message.date) : null,
     [message.date],
   );
-  const locale = "en-US"; // TODO: Make dynamic via props or context
+  const locale = i18n.language;
 
   const formattedTime = useMemo(
     () =>