diff --git a/src/interface/web/app/components/chatMessage/chatMessage.module.css b/src/interface/web/app/components/chatMessage/chatMessage.module.css
index 2abfdda7..475a9c09 100644
--- a/src/interface/web/app/components/chatMessage/chatMessage.module.css
+++ b/src/interface/web/app/components/chatMessage/chatMessage.module.css
@@ -25,7 +25,6 @@ div.chatMessageWrapper a span {
 }
 
 div.khojfullHistory {
-    border-width: 1px;
     padding-left: 4px;
 }
 
diff --git a/src/interface/web/app/components/chatMessage/chatMessage.tsx b/src/interface/web/app/components/chatMessage/chatMessage.tsx
index 4b25346e..8c76c551 100644
--- a/src/interface/web/app/components/chatMessage/chatMessage.tsx
+++ b/src/interface/web/app/components/chatMessage/chatMessage.tsx
@@ -559,7 +559,10 @@ const ChatMessage = forwardRef<HTMLDivElement, ChatMessageProps>((props, ref) =>
     }
 
     function constructClasses(chatMessage: SingleChatMessage) {
-        let classes = [styles.chatMessageContainer, "shadow-md"];
+        let classes = [styles.chatMessageContainer];
+        if (chatMessage.by === "khoj") {
+            classes.push("shadow-md");
+        }
         classes.push(styles[chatMessage.by]);
         if (!chatMessage.message) {
             classes.push(styles.emptyChatMessage);