diff --git a/materialious/src/lib/components/Player.svelte b/materialious/src/lib/components/Player.svelte
index 7d1db0c6..d0b77e72 100644
--- a/materialious/src/lib/components/Player.svelte
+++ b/materialious/src/lib/components/Player.svelte
@@ -790,6 +790,9 @@
 
 	onDestroy(async () => {
 		if (Capacitor.getPlatform() === 'android' && !$isAndroidTvStore) {
+			document.removeEventListener('fullscreenchange', onAndroidFullscreenChange);
+			await Motion.removeAllListeners();
+
 			if (originalOrigination) {
 				await ScreenOrientation.lock({
 					orientation: originalOrigination.type
@@ -801,8 +804,6 @@
 			savePlayerPos();
 		} catch (error) {}
 
-		document.removeEventListener('fullscreenchange', onAndroidFullscreenChange);
-
 		Mousetrap.unbind(['left', 'right', 'space', 'c', 'f', 'shift+left', 'shift+right']);
 
 		if (watchProgressTimeout) {