diff --git a/web/src/api/buster_rest/metrics/getMetricQueryRequests.ts b/web/src/api/buster_rest/metrics/getMetricQueryRequests.ts
index 8bd6f256c..1107dd1e6 100644
--- a/web/src/api/buster_rest/metrics/getMetricQueryRequests.ts
+++ b/web/src/api/buster_rest/metrics/getMetricQueryRequests.ts
@@ -67,7 +67,7 @@ export const useGetMetric = <TData = IBusterMetric>(
   });
 
   return useQuery({
-    queryKey: metricsQueryKeys.metricsGetMetric(id!, selectedVersionNumber).queryKey,
+    ...metricsQueryKeys.metricsGetMetric(id!, selectedVersionNumber),
     enabled: !!latestVersionNumber && isFetchedInitial && !isErrorInitial,
     queryFn: () => initialQueryFn(selectedVersionNumber),
     select: params?.select
diff --git a/web/src/api/query_keys/metric.ts b/web/src/api/query_keys/metric.ts
index dd04f9113..8c8476a98 100644
--- a/web/src/api/query_keys/metric.ts
+++ b/web/src/api/query_keys/metric.ts
@@ -9,7 +9,7 @@ import { type listMetrics } from '../buster_rest/metrics';
 export const metricsGetMetric = (metricId: string, version_number: number | null) => {
   return queryOptions<IBusterMetric>({
     queryKey: ['metrics', 'get', metricId, version_number || 'INITIAL'] as const,
-    staleTime: 30 * 60 * 1000
+    staleTime: 60 * 1000
   });
 };
 
diff --git a/web/src/components/ui/inputs/InputTextArea.tsx b/web/src/components/ui/inputs/InputTextArea.tsx
index a96bf2899..d9ddc70eb 100644
--- a/web/src/components/ui/inputs/InputTextArea.tsx
+++ b/web/src/components/ui/inputs/InputTextArea.tsx
@@ -155,6 +155,10 @@ export const InputTextArea = React.forwardRef<HTMLTextAreaElement, InputTextArea
       };
     }, [autoResize]);
 
+    useEffect(() => {
+      if (!props.value) adjustHeight();
+    }, [props.value]);
+
     return (
       <textarea
         ref={combinedRef}
diff --git a/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatContent.tsx b/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatContent.tsx
index cdb56b961..4ed145a0b 100644
--- a/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatContent.tsx
+++ b/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatContent.tsx
@@ -31,7 +31,7 @@ export const ChatContent: React.FC<{}> = React.memo(() => {
 
   return (
     <>
-      <div className="mb-40 flex h-full w-full flex-col">
+      <div className="mb-48 flex h-full w-full flex-col">
         {chatMessageIds?.map((messageId, index) => (
           <div key={messageId} className={autoClass}>
             <ChatMessageBlock