diff --git a/web/src/components/Message.vue b/web/src/components/Message.vue
index ba5b91e4..8acac3ac 100644
--- a/web/src/components/Message.vue
+++ b/web/src/components/Message.vue
@@ -152,8 +152,10 @@ export default {
                 return userImgPlaceholder;
 
             }
-           
+           if(this.avatar){
             return bUrl + this.avatar
+           }
+           return botImgPlaceholder;
 
         },
         defaultImg(event) {
diff --git a/web/src/views/DiscussionsView.vue b/web/src/views/DiscussionsView.vue
index bcebab78..43ffd2e7 100644
--- a/web/src/views/DiscussionsView.vue
+++ b/web/src/views/DiscussionsView.vue
@@ -125,7 +125,7 @@
         <div class="relative overflow-y-scroll no-scrollbar">
             <!-- DISCUSSION LIST -->
             <div class="mx-4 flex-grow" :class="filterInProgress ? 'opacity-20 pointer-events-none' : ''">
-                <TransitionGroup name="list" >
+                <TransitionGroup v-if="list.length>0" name="list" >
                 <Discussion v-for="(item, index) in list" :key="item.id" :id="item.id" :title="item.title"
                     :selected="currentDiscussion.id == item.id" :loading="item.loading" :isCheckbox="isCheckbox"
                     :checkBoxValue="item.checkBoxValue" @select="selectDiscussion(item)" @delete="deleteDiscussion(item.id)"
@@ -147,14 +147,14 @@
 
         <!-- CHAT AREA -->
         <div class="container flex flex-col flex-grow pt-4 pb-10">
-            <TransitionGroup name="list" >
+            <TransitionGroup v-if="discussionArr.length>0" name="list" >
             <Message v-for="(msg, index) in discussionArr" :key="msg.id" :message="msg" :id="'msg-' + msg.id" ref="messages"
                 @copy="copyToClipBoard" @delete="deleteMessage" @rankUp="rankUpMessage" @rankDown="rankDownMessage"
                 @updateMessage="updateMessage" @resendMessage="resendMessage" :avatar="getAvatar(msg.sender)" />
-
-            <WelcomeComponent v-if="!currentDiscussion.id" />
+               
+           
         </TransitionGroup>
-
+        <WelcomeComponent  v-if="!currentDiscussion.id" />
         </div>
         <div class=" sticky bottom-0">
             <ChatBox v-if="currentDiscussion.id" @messageSentEvent="sendMsg" :loading="isGenerating"