diff --git a/src/app/watch/Watch.tsx b/src/app/watch/Watch.tsx
index ec5f427..d126daa 100644
--- a/src/app/watch/Watch.tsx
+++ b/src/app/watch/Watch.tsx
@@ -2,6 +2,7 @@
 
 import { useQuery } from "@tanstack/react-query";
 import { useSearchParams } from "next/navigation";
+import { useMemo } from "react";
 
 import { useClient } from "@/hooks/useClient";
 
@@ -12,13 +13,16 @@ export const Watch: Component = () => {
 
 	const searchParams = useSearchParams();
 
-	const videoId = searchParams.get("v");
+	const videoId = searchParams.get("v") as string;
+
+	const videoIdIsInvalid = useMemo(() => videoId === null, [videoId]);
 
 	const { data, error } = useQuery({
 		queryKey: ["watch", videoId],
 		queryFn: () => {
-			return client.getStream(videoId ?? "");
-		}
+			return client.getStream(videoId);
+		},
+		enabled: !videoIdIsInvalid
 	});
 
 	console.log(data, error);
diff --git a/src/client/adapters/index.ts b/src/client/adapters/index.ts
index 4ecae42..8ed8778 100644
--- a/src/client/adapters/index.ts
+++ b/src/client/adapters/index.ts
@@ -1,7 +1,7 @@
 import { SearchResults } from "@/client/typings/search";
 import { SearchOptions } from "@/client/typings/search/options";
-import { Stream } from "@/client/typings/search/stream";
 import { Suggestions } from "@/client/typings/search/suggestions";
+import { Stream } from "@/client/typings/stream";
 import { Video } from "@/client/typings/video";
 
 export interface ConnectedAdapter {
diff --git a/src/client/adapters/invidious/transformer.ts b/src/client/adapters/invidious/transformer.ts
index a0f6d09..f346ea3 100644
--- a/src/client/adapters/invidious/transformer.ts
+++ b/src/client/adapters/invidious/transformer.ts
@@ -31,9 +31,7 @@ export default class Transformer {
 		return thumbnail?.url ?? null;
 	}
 
-	private static recommendedVideo(
-		data: InvidiousRecommendedVideo
-	): RecommendedVideo {
+	private static recommendedVideo(data: InvidiousRecommendedVideo): VideoItem {
 		const thumbnail = Transformer.findBestThumbnail(data.videoThumbnails);
 
 		if (thumbnail === null)
@@ -42,6 +40,8 @@ export default class Transformer {
 			);
 
 		return {
+			type: "video",
+			uploaded: new Date(),
 			author: { id: data.authorId, name: data.author },
 			duration: data.lengthSeconds * 1000,
 			live: data.liveNow,
diff --git a/src/client/adapters/piped/transformer.ts b/src/client/adapters/piped/transformer.ts
index f147de7..159d2fb 100644
--- a/src/client/adapters/piped/transformer.ts
+++ b/src/client/adapters/piped/transformer.ts
@@ -82,7 +82,6 @@ export default class Transformer {
 			uploaded: new Date(data.uploaded),
 			thumbnail: data.thumbnail,
 			title: data.title,
-			description: "",
 			live: false,
 			author: {
 				id: channelId,
diff --git a/src/client/adapters/piped/typings/stream.ts b/src/client/adapters/piped/typings/stream.ts
index b30ebcd..8e58e66 100644
--- a/src/client/adapters/piped/typings/stream.ts
+++ b/src/client/adapters/piped/typings/stream.ts
@@ -73,8 +73,8 @@ export const StreamModel = z.object({
 	uploaderAvatar: z.string().url(),
 	thumbnailUrl: z.string().url(),
 	hls: z.string().url(),
-	dash: z.null(),
-	lbryId: z.null(),
+	dash: z.string().url().nullable(),
+	lbryId: z.string().nullable(),
 	category: z.string(),
 	license: z.string(),
 	visibility: z.string(),
diff --git a/src/client/typings/video.ts b/src/client/typings/video.ts
index dce2bd7..7da8d34 100644
--- a/src/client/typings/video.ts
+++ b/src/client/typings/video.ts
@@ -7,7 +7,7 @@ export interface Video {
 		avatar?: string;
 	};
 	thumbnail: string;
-	description: string;
+	description?: string;
 	/*
 		Duration in milliseconds.
 	*/
diff --git a/src/hooks/useClient.ts b/src/hooks/useClient.ts
index 78e63c7..3f1de5c 100644
--- a/src/hooks/useClient.ts
+++ b/src/hooks/useClient.ts
@@ -7,8 +7,8 @@ export const useClient = (): Client => {
 	const [client] = useState(
 		() =>
 			new Client([
-				// { baseUrl: "https://invidious.fdn.fr/", type: ApiType.Invidious }
-				{ baseUrl: "https://pipedapi.kavin.rocks", type: ApiType.Piped }
+				{ baseUrl: "https://invidious.fdn.fr/", type: ApiType.Invidious }
+				// { baseUrl: "https://pipedapi.kavin.rocks", type: ApiType.Piped }
 			])
 	);