diff --git a/materialious/src/lib/components/Player.svelte b/materialious/src/lib/components/Player.svelte
index 626068de..4a09c055 100644
--- a/materialious/src/lib/components/Player.svelte
+++ b/materialious/src/lib/components/Player.svelte
@@ -85,7 +85,7 @@
 	let playerCurrentTime = $state(0);
 	let playerMaxKnownTime = $state(data.video.lengthSeconds);
 	let playerPauseTimeUpdates = $state(false);
-	let playerIsBuffering = $state(false);
+	let playerIsBuffering = $state(true);
 	let playerVolume = $state(0);
 	let playerSettings: 'quality' | 'speed' | 'language' | 'root' = $state('root');
 	let playerTextTracks: shaka.extern.TextTrack[] | undefined = $state(undefined);
diff --git a/materialious/src/lib/store.ts b/materialious/src/lib/store.ts
index d18a51cf..7c0ad5fd 100644
--- a/materialious/src/lib/store.ts
+++ b/materialious/src/lib/store.ts
@@ -80,7 +80,7 @@ function createStorage(): StorageInterface<any> | SelfUpdateStorageInterface<any
 	}
 }
 
-function platformDependentDefault(givenValue: any, defaultValue: any): any {
+function ifNotWebDefault(givenValue: any, defaultValue: any): any {
 	if (typeof givenValue !== 'undefined' && givenValue !== null) {
 		return givenValue;
 	} else if (defaultValue && Capacitor.getPlatform() !== 'web') {
@@ -90,7 +90,7 @@ function platformDependentDefault(givenValue: any, defaultValue: any): any {
 
 export const instanceStore: Writable<string> = persist(
 	writable(
-		platformDependentDefault(
+		ifNotWebDefault(
 			!import.meta.env.VITE_DEFAULT_INVIDIOUS_INSTANCE
 				? undefined
 				: ensureNoTrailingSlash(import.meta.env.VITE_DEFAULT_INVIDIOUS_INSTANCE),
@@ -183,7 +183,7 @@ export const playertheatreModeIsActive = writable(false);
 export const returnYtDislikesStore = persist(writable(false), createStorage(), 'returnYtDislikes');
 export const returnYTDislikesInstanceStore: Writable<string | null | undefined> = persist(
 	writable(
-		platformDependentDefault(
+		ifNotWebDefault(
 			import.meta.env.VITE_DEFAULT_RETURNYTDISLIKES_INSTANCE,
 			'https://ryd-proxy.materialio.us'
 		)
@@ -195,7 +195,7 @@ export const returnYTDislikesInstanceStore: Writable<string | null | undefined>
 export const synciousStore = persist(writable(false), createStorage(), 'syncious');
 export const synciousInstanceStore: Writable<string | null | undefined> = persist(
 	writable(
-		platformDependentDefault(
+		ifNotWebDefault(
 			import.meta.env.VITE_DEFAULT_SYNCIOUS_INSTANCE ||
 				import.meta.env.VITE_DEFAULT_API_EXTENDED_INSTANCE,
 			'https://extended-api.materialio.us'