diff --git a/materialious/src/lib/patches/youtubejs.ts b/materialious/src/lib/patches/youtubejs.ts
index 3280084b..85169d70 100644
--- a/materialious/src/lib/patches/youtubejs.ts
+++ b/materialious/src/lib/patches/youtubejs.ts
@@ -1,24 +1,33 @@
 import type { Image, Thumbnail, VideoBase, VideoPlay } from '$lib/Api/model';
 import { numberWithCommas } from '$lib/misc';
-import { androidPoToken } from '$lib/store';
+import { poTokenCacheStore } from '$lib/store';
 import { Capacitor } from '@capacitor/core';
 import { get } from 'svelte/store';
+import { getPoToken, type PoTokens } from './poTokenAndroid';
 
 export async function patchYoutubeJs(videoId: string): Promise<VideoPlay> {
   const innertube = (await import('youtubei.js')).Innertube;
 
-  let tokens;
-  if (Capacitor.getPlatform() === 'electron') {
-    tokens = await (window as any).electron.generatePoToken();
-  } else if (Capacitor.getPlatform() === 'android' && get(androidPoToken)) {
-    tokens = get(androidPoToken);
+  let tokens: PoTokens;
+
+  const poTokenCache = get(poTokenCacheStore);
+  if (!poTokenCache) {
+    if (Capacitor.getPlatform() === 'electron') {
+      tokens = await (window as any).electron.generatePoToken();
+    } else if (Capacitor.getPlatform() === 'android') {
+      tokens = await getPoToken();
+    } else {
+      throw new Error('This platform cant generate po tokens');
+    }
+
+    poTokenCacheStore.set(tokens);
   } else {
-    throw new Error('This platform cant generate po tokens');
+    tokens = poTokenCache;
   }
 
   const youtube = await innertube.create({
-    visitor_data: tokens.visitorData,
-    po_token: tokens.poToken,
+    visitor_data: tokens.visitor_data,
+    po_token: tokens.po_token,
     // Custom fetch method required so capacitor http patch is used
     fetch: async (input: RequestInfo | URL, init?: RequestInit) => {
       return window.fetch(input, init);
diff --git a/materialious/src/lib/store.ts b/materialious/src/lib/store.ts
index 85d7b06a..35a8c9e9 100644
--- a/materialious/src/lib/store.ts
+++ b/materialious/src/lib/store.ts
@@ -100,4 +100,4 @@ export const miniPlayerSrcStore: Writable<{ video: VideoPlay; time: number; } |
 
 export const silenceSkipperStore: Writable<boolean> = persisted('silenceSkipper', false);
 
-export const androidPoToken: Writable<PoTokens> = writable();
+export const poTokenCacheStore: Writable<PoTokens> = writable();
diff --git a/materialious/src/routes/(app)/+layout.svelte b/materialious/src/routes/(app)/+layout.svelte
index 4cfca797..72dc2ab2 100644
--- a/materialious/src/routes/(app)/+layout.svelte
+++ b/materialious/src/routes/(app)/+layout.svelte
@@ -13,7 +13,6 @@
 	import { bookmarkletLoadFromUrl, loadSettingsFromEnv } from '$lib/externalSettings';
 	import {
 		activePageStore,
-		androidPoToken,
 		authStore,
 		darkModeStore,
 		instanceStore,
@@ -158,13 +157,6 @@
 		if (isLoggedIn) {
 			loadNotifications().catch(() => authStore.set(null));
 		}
-
-		// Po token is generated for android on startup
-		if (Capacitor.getPlatform() === 'android') {
-			const getPoToken = (await import('../../lib/patches/poTokenAndroid')).getPoToken;
-
-			androidPoToken.set(await getPoToken());
-		}
 	});
 
 	$: webManifestLink = pwaInfo ? pwaInfo.webManifest.linkTag : '';