diff --git a/materialious/src/lib/components/Player.svelte b/materialious/src/lib/components/Player.svelte
index 99a48735..067f2769 100644
--- a/materialious/src/lib/components/Player.svelte
+++ b/materialious/src/lib/components/Player.svelte
@@ -585,7 +585,10 @@
 		playerElement.addEventListener('ended', async () => {
 			if (!data.playlistId) {
 				if ($playerAutoplayNextByDefaultStore) {
-					goto(`/${$isAndroidTvStore ? 'tv' : 'watch'}/${data.video.recommendedVideos[0].videoId}`);
+					goto(
+						`/${$isAndroidTvStore ? 'tv' : 'watch'}/${data.video.recommendedVideos[0].videoId}`,
+						{ replaceState: $isAndroidTvStore }
+					);
 				}
 
 				return;
@@ -629,7 +632,8 @@
 				}
 
 				goto(
-					`/${$isAndroidTvStore ? 'tv' : 'watch'}/${goToVideo.videoId}?playlist=${data.playlistId}`
+					`/${$isAndroidTvStore ? 'tv' : 'watch'}/${goToVideo.videoId}?playlist=${data.playlistId}`,
+					{ replaceState: $isAndroidTvStore }
 				);
 			}
 		});
diff --git a/materialious/src/lib/components/Thumbnail.svelte b/materialious/src/lib/components/Thumbnail.svelte
index 6a7c2aa5..9d3c5de7 100644
--- a/materialious/src/lib/components/Thumbnail.svelte
+++ b/materialious/src/lib/components/Thumbnail.svelte
@@ -22,6 +22,7 @@
 	} from '../store';
 	import { goto } from '$app/navigation';
 	import { queueSyncious } from '$lib/api/apiExtended';
+	import { page } from '$app/state';
 
 	interface Props {
 		video: VideoBase | Video | Notification | PlaylistPageVideo;
@@ -165,7 +166,7 @@
 	tabindex="0"
 	role="button"
 	onclick={async () => {
-		goto(watchUrl);
+		goto(watchUrl, { replaceState: $isAndroidTvStore && page.url.pathname.startsWith('/tv') });
 	}}
 >
 	<div id="thumbnail-container">