diff --git a/src/routes/api/queue/+server.ts b/src/routes/api/queue/+server.ts
index 07f74c0..a5aad12 100644
--- a/src/routes/api/queue/+server.ts
+++ b/src/routes/api/queue/+server.ts
@@ -58,12 +58,7 @@ export const POST: RequestHandler = async ({ request }) => {
 			return json({
 				duplicate: true,
 				message: 'This recipe is already in the queue',
-				item: {
-					id: existingItem.id,
-					url: existingItem.url,
-					status: existingItem.status,
-					enqueuedAt: existingItem.enqueuedAt
-				}
+				item: existingItem
 			}, { status: 200 }); // 200 OK, not an error
 		}
 
@@ -73,12 +68,7 @@ export const POST: RequestHandler = async ({ request }) => {
 		// Return success response
 		return json({
 			duplicate: false,
-			item: {
-				id: queueItem.id,
-				url: queueItem.url,
-				status: queueItem.status,
-				enqueuedAt: queueItem.enqueuedAt
-			}
+			item: queueItem
 		});
 	} catch (error) {
 		return handleApiError(error);
diff --git a/src/routes/components/TimelineRow.svelte b/src/routes/components/TimelineRow.svelte
index f9d176f..3d96340 100644
--- a/src/routes/components/TimelineRow.svelte
+++ b/src/routes/components/TimelineRow.svelte
@@ -22,8 +22,10 @@
 		return m ? '@' + m[1] : '@instagram';
 	}
 
-	function relTime(iso: string): string {
+	function relTime(iso: string | undefined): string {
+		if (!iso) return 'just now';
 		const diff = (Date.now() - new Date(iso).getTime()) / 1000;
+		if (isNaN(diff) || diff < 0) return 'just now';
 		if (diff < 60) return 'just now';
 		if (diff < 3600) return Math.floor(diff / 60) + 'm ago';
 		if (diff < 86400) return Math.floor(diff / 3600) + 'h ago';
@@ -62,7 +64,7 @@
 		<div class="meta">
 			<span class="uname">{username(item.url)}</span>
 			<span class="sep">·</span>
-			<span>{relTime(item.createdAt)}</span>
+			<span>{relTime(item.createdAt ?? item.enqueuedAt)}</span>
 		</div>
 		{#if isError && item.error}
 			<div class="error-line">{item.error.message?.slice(0, 60)}…</div>