diff --git a/src/app/components/badges/created-ago-badge/index.tsx b/src/app/components/badges/created-ago-badge/index.tsx
index 735c1198..2237eed6 100644
--- a/src/app/components/badges/created-ago-badge/index.tsx
+++ b/src/app/components/badges/created-ago-badge/index.tsx
@@ -7,7 +7,7 @@ import { useMemo, useState, useEffect } from "react"
 import Badge from "../badge"
 
 const CreatedAgoBadge = ({ createdAt }: { createdAt: string | Date }) => {
-	const createdDate = new Date(createdAt)
+	const createdDate = useMemo(() => new Date(createdAt), [createdAt])
 	const [time, setTimeAgo] = useState(timeAgo(createdDate))
 
 	const { setToast } = useToasts()
diff --git a/src/app/components/header/buttons.tsx b/src/app/components/header/buttons.tsx
index 16c172b0..c064afd3 100644
--- a/src/app/components/header/buttons.tsx
+++ b/src/app/components/header/buttons.tsx
@@ -1,6 +1,6 @@
 "use client"
 
-import { useSelectedLayoutSegment, useSelectedLayoutSegments } from "next/navigation"
+import { useSelectedLayoutSegments } from "next/navigation"
 import FadeIn from "@components/fade-in"
 import { setDriftTheme } from "src/app/lib/set-theme"
 import {
@@ -47,12 +47,14 @@ export function HeaderButtons({
 }) {
 	const { isAdmin, userId } = useSessionSWR()
 	const { resolvedTheme } = useTheme();
-	return getButtons({
-				isAuthenticated,
-				theme: resolvedTheme ? resolvedTheme : initialTheme,
-				isAdmin,
-				userId
-			})
+	return <>
+		{getButtons({
+			isAuthenticated,
+			theme: resolvedTheme ? resolvedTheme : initialTheme,
+			isAdmin,
+			userId
+		})}
+	</>
 }
 
 function NavButton(tab: Tab) {