diff --git a/packages/bot-web-ui/src/components/journal/journal-components/format-message.tsx b/packages/bot-web-ui/src/components/journal/journal-components/format-message.tsx
index 3a4e46bf42b8..df283ab6a712 100644
--- a/packages/bot-web-ui/src/components/journal/journal-components/format-message.tsx
+++ b/packages/bot-web-ui/src/components/journal/journal-components/format-message.tsx
@@ -85,7 +85,7 @@ const FormatMessage = ({ logType, className, extra }: TFormatMessageProps) => {
                             }}
                         />
                     );
-                return <Localize i18n_default_text='Welcome!' />;
+                break;
             }
             default:
                 return null;
diff --git a/packages/bot-web-ui/src/stores/download-store.js b/packages/bot-web-ui/src/stores/download-store.js
index e86a6be09ff3..efc85e3db237 100644
--- a/packages/bot-web-ui/src/stores/download-store.js
+++ b/packages/bot-web-ui/src/stores/download-store.js
@@ -45,7 +45,7 @@ export default class DownloadStore {
             case log_types.WELCOME: {
                 if (current_currency)
                     return localize('You are using your {{current_currency}} account.', { current_currency });
-                return localize('Welcome!');
+                break;
             }
             default:
                 return null;
diff --git a/packages/bot-web-ui/src/stores/journal-store.js b/packages/bot-web-ui/src/stores/journal-store.js
index 30f0f3abd20c..40928678a503 100644
--- a/packages/bot-web-ui/src/stores/journal-store.js
+++ b/packages/bot-web-ui/src/stores/journal-store.js
@@ -50,8 +50,10 @@ export default class JournalStore {
     unfiltered_messages = [];
 
     restoreStoredJournals() {
+        const { loginid } = this.core?.client;
+
         this.journal_filters = getSetting('journal_filter') || this.filters.map(filter => filter.id);
-        this.unfiltered_messages = getStoredItemsByUser(this.JOURNAL_CACHE, this.core?.client.loginid, []);
+        this.unfiltered_messages = getStoredItemsByUser(this.JOURNAL_CACHE, loginid, []);
 
         if (this.unfiltered_messages.length > 0) {
             this.welcomeBackUser();
@@ -107,8 +109,13 @@ export default class JournalStore {
 
     pushMessage(message, message_type, className, extra = {}) {
         const { client } = this.core;
-        if (!client?.loginid) return;
-        extra.current_currency = client?.current_currency_type === 'virtual' ? 'Demo' : client?.currency;
+        const { loginid, current_currency_type, currency } = client;
+
+        if (loginid) {
+            extra.current_currency = current_currency_type === 'virtual' ? 'Demo' : currency;
+        } else if (message === log_types.WELCOME) {
+            return;
+        }
 
         const date = formatDate(this.getServerTime());
         const time = formatDate(this.getServerTime(), 'HH:mm:ss [GMT]');