diff --git a/frontend/src/app/page.tsx b/frontend/src/app/page.tsx
index e6452ecd..c22b3a92 100644
--- a/frontend/src/app/page.tsx
+++ b/frontend/src/app/page.tsx
@@ -55,7 +55,6 @@ export default function HomePage() {
   const { user, loading } = useAuth();
   const router = useRouter();
   const [hallOfFameOpen, setHallOfFameOpen] = useState(false);
-  const [maintenanceVisible, setMaintenanceVisible] = useState(true);
 
   const docsUrl = (process.env.NEXT_PUBLIC_API_URL || "https://param20h-pdf-assit-rag.hf.space") + "/docs";
 
@@ -283,28 +282,6 @@ export default function HomePage() {
 
       {/* Floating open-source badge */}
       <OpenSourceBadge onOpenHallOfFame={() => setHallOfFameOpen(true)} />
-
-      {/* Maintenance Pop-up Banner */}
-      {maintenanceVisible && (
-        <div className="fixed bottom-6 right-6 z-50 max-w-sm p-4 rounded-xl border border-amber-500/30 bg-background/95 backdrop-blur-md shadow-2xl shadow-amber-500/5 flex flex-col gap-2.5 animate-fade-in-up">
-          <div className="flex items-start justify-between gap-4">
-            <div className="flex items-center gap-2">
-              <span className="w-2.5 h-2.5 rounded-full bg-amber-500 animate-pulse" />
-              <h4 className="font-semibold text-sm text-foreground">System Maintenance</h4>
-            </div>
-            <button 
-              onClick={() => setMaintenanceVisible(false)}
-              className="text-muted-foreground hover:text-foreground text-xs p-1"
-              aria-label="Dismiss maintenance alert"
-            >
-              ✕
-            </button>
-          </div>
-          <p className="text-xs text-muted-foreground leading-relaxed">
-            We are currently running database updates. Some features may be temporarily offline, but the app will be fully live soon!
-          </p>
-        </div>
-      )}
     </div>
   );
 }
diff --git a/frontend/src/components/chat/MessageBubble.tsx b/frontend/src/components/chat/MessageBubble.tsx
index b3710276..2460a2ba 100644
--- a/frontend/src/components/chat/MessageBubble.tsx
+++ b/frontend/src/components/chat/MessageBubble.tsx
@@ -73,6 +73,28 @@ const markdownComponents: Components = {
   },
 };
 
+/**
+ * Extracts a valid Date from a message.
+ *
+ * History messages from the DB have real UUIDs as IDs —
+ * splitting on "-" and parsing as a number gives NaN.
+ * We use `created_at` (returned by the history API) when
+ * available, and fall back to the synthetic ID-based
+ * timestamp only for streamed messages (format: role-timestamp).
+ */
+const getMessageDate = (message: ChatMsg): Date | null => {
+  if (message.created_at) {
+    const d = new Date(message.created_at);
+    if (!isNaN(d.getTime())) return d;
+  }
+  const parts = message.id.split("-");
+  if (parts.length >= 2) {
+    const ts = Number(parts[1]);
+    if (!isNaN(ts) && ts > 0) return new Date(ts);
+  }
+  return null;
+};
+
 export default function MessageBubble({ message }: Props) {
   const isUser = message.role === "user";
   const [copied, setCopied] = useState(false);
@@ -109,6 +131,8 @@ export default function MessageBubble({ message }: Props) {
     large: "text-base",
   }[activeFontSize];
 
+  const messageDate = getMessageDate(message);
+
   const handleCopy = async () => {
     if (!message.content) return;
     try {
@@ -177,7 +201,6 @@ export default function MessageBubble({ message }: Props) {
 
   const handleBranch = () => {
     setCurrentBranchId(message.id);
-
     console.log("Branch created from:", message.id);
   };
 
@@ -355,13 +378,11 @@ export default function MessageBubble({ message }: Props) {
             isUser ? "justify-end" : "justify-start"
           }`}
         >
-          <div
-            title={new Date(Number(message.id.split("-")[1])).toLocaleString()}
-          >
-            {formatDistanceToNow(new Date(Number(message.id.split("-")[1])), {
-              addSuffix: true,
-            })}
-          </div>
+          {messageDate && (
+            <div title={messageDate.toLocaleString()}>
+              {formatDistanceToNow(messageDate, { addSuffix: true })}
+            </div>
+          )}
           {!isUser && message.response_time_ms && (
             <span className="text-[10px] ml-auto">
               ⚡ {(message.response_time_ms / 1000).toFixed(1)}s
@@ -369,6 +390,7 @@ export default function MessageBubble({ message }: Props) {
           )}
         </div>
       </div>
+
       {isUser && (
         <div className="w-8 h-8 rounded-lg bg-primary/20 flex items-center justify-center shrink-0 mt-0.5">
           <User className="w-4 h-4 text-primary-foreground" />
diff --git a/frontend/src/store/chat-store.ts b/frontend/src/store/chat-store.ts
index 25097890..a1eccd12 100644
--- a/frontend/src/store/chat-store.ts
+++ b/frontend/src/store/chat-store.ts
@@ -30,6 +30,7 @@ export interface ChatMsg {
   feedback?: "up" | "down" | null;
   isStreaming?: boolean;
   response_time_ms?: number;
+  created_at?: string;
 }
 
 export interface ChatSession {
@@ -93,7 +94,9 @@ export const useChatStore = create<ChatStore>((set, get) => ({
   },
 
   setIsTyping(value) {
-    set((state) => ({ isTyping: resolveValue(value, state.isTyping) }));
+    set((state) => ({
+      isTyping: resolveValue(value, state.isTyping),
+    }));
   },
 
   setHistoryLoading(value) {