diff --git a/frontend/app/javascript/widget/components/AgentMessage.vue b/frontend/app/javascript/widget/components/AgentMessage.vue
index a13f7bf6..f2f133aa 100755
--- a/frontend/app/javascript/widget/components/AgentMessage.vue
+++ b/frontend/app/javascript/widget/components/AgentMessage.vue
@@ -76,11 +76,7 @@ export default {
         return this.message.additional_attributes.sender_name;
       }
 
-      if (this.useInboxAvatarForBot) {
-        return this.channelConfig.websiteName;
-      }
-
-      return this.$t('UNREAD_VIEW.BOT');
+      return this.channelConfig.websiteName || '';
     },
     avatarUrl() {
       const displayImage = this.useInboxAvatarForBot
diff --git a/frontend/app/javascript/widget/components/UnreadMessage.vue b/frontend/app/javascript/widget/components/UnreadMessage.vue
index ca950035..74a4ae35 100644
--- a/frontend/app/javascript/widget/components/UnreadMessage.vue
+++ b/frontend/app/javascript/widget/components/UnreadMessage.vue
@@ -63,10 +63,7 @@ export default {
         const { available_name: availableName, name } = this.sender;
         return availableName || name || '';
       }
-      if (this.useInboxAvatarForBot) {
-        return this.channelConfig.websiteName;
-      }
-      return this.$t('UNREAD_VIEW.BOT');
+      return this.channelConfig.websiteName || '';
     },
     availabilityStatus() {
       if (this.isSenderExist(this.sender)) {
diff --git a/frontend/app/javascript/widget/components/specs/agentName.spec.js b/frontend/app/javascript/widget/components/specs/agentName.spec.js
new file mode 100644
index 00000000..c4f3a714
--- /dev/null
+++ b/frontend/app/javascript/widget/components/specs/agentName.spec.js
@@ -0,0 +1,26 @@
+import AgentMessage from '../AgentMessage.vue';
+import UnreadMessage from '../UnreadMessage.vue';
+
+const context = {
+  channelConfig: { websiteName: 'GoChat' },
+  useInboxAvatarForBot: false,
+  $t: key => key,
+};
+
+describe('widget agent name', () => {
+  it('uses the inbox name when a conversation message has no public sender', () => {
+    expect(
+      AgentMessage.computed.agentName.call({ ...context, message: {} })
+    ).toBe('GoChat');
+  });
+
+  it('uses the inbox name when an unread message has no public sender', () => {
+    expect(
+      UnreadMessage.computed.agentName.call({
+        ...context,
+        sender: {},
+        isSenderExist: UnreadMessage.methods.isSenderExist,
+      })
+    ).toBe('GoChat');
+  });
+});