diff --git a/frontend/src/components/TradeBox/EncryptedChat/index.tsx b/frontend/src/components/TradeBox/EncryptedChat/index.tsx
index 83d16fd3..b8f4ea0d 100644
--- a/frontend/src/components/TradeBox/EncryptedChat/index.tsx
+++ b/frontend/src/components/TradeBox/EncryptedChat/index.tsx
@@ -82,9 +82,9 @@ const EncryptedChat: React.FC<Props> = ({
 
       const wrappedEvent = nip17.wrapEvent(slot?.nostrSecKey, recipient, content);
 
-    const oneMonth = 2419200;
+      const oneMonth = 2419200;
 
-    wrappedEvent.tags.push(['expiration', (wrappedEvent.created_at + oneMonth).toString()]);
+      wrappedEvent.tags.push(['expiration', (wrappedEvent.created_at + oneMonth).toString()]);
 
       federation.roboPool.sendEvent(wrappedEvent);
     } catch (error) {
diff --git a/frontend/src/contexts/AppContext.tsx b/frontend/src/contexts/AppContext.tsx
index c8f46f61..bf59ded6 100644
--- a/frontend/src/contexts/AppContext.tsx
+++ b/frontend/src/contexts/AppContext.tsx
@@ -226,6 +226,7 @@ export const AppContextProvider = ({ children }: AppContextProviderProps): React
   }, [settings.fontSize, settings.mode, settings.lightQRs]);
 
   useEffect(() => {
+    setSettings(getSettings());
     void i18n.changeLanguage(settings.language);
     window.addEventListener('torStatus', (event) => {
       // Trick to improve UX on Android webview: delay the "Connected to TOR" status by 5 secs to avoid long waits on the first request.