diff --git a/App.tsx b/App.tsx
index 959f7542..05fb8b78 100644
--- a/App.tsx
+++ b/App.tsx
@@ -12,6 +12,7 @@ import { clientPersister } from './constants/storage';
 import { queryClient } from './constants/query-client';
 import { CacheManager } from '@georstat/react-native-image-cache';
 import { Dirs } from "react-native-file-access";
+import TrackPlayer from 'react-native-track-player';
 
 CacheManager.config = {
   baseDir: `${Dirs.CacheDir}/images_cache/`,
@@ -25,6 +26,8 @@ CacheManager.config = {
 
 export default function App(): React.JSX.Element {
   
+  const isPlayerReady = TrackPlayer.setupPlayer();
+
   const isDarkMode = useColorScheme() === 'dark';
   
   return (
diff --git a/index.js b/index.js
index 13cdf254..b40b214f 100644
--- a/index.js
+++ b/index.js
@@ -6,4 +6,4 @@ import { PlaybackService } from './player/service'
 import TrackPlayer from 'react-native-track-player';
 
 AppRegistry.registerComponent(appName, () => App);
-TrackPlayer.registerPlaybackService(() => PlaybackService());
\ No newline at end of file
+TrackPlayer.registerPlaybackService(() => PlaybackService);
\ No newline at end of file
diff --git a/player/service.ts b/player/service.ts
index 13dc34fb..22ebc645 100644
--- a/player/service.ts
+++ b/player/service.ts
@@ -3,10 +3,13 @@ import TrackPlayer, { Event } from "react-native-track-player";
 export async function PlaybackService() {
 
     console.debug("Registering playback service");
-    TrackPlayer.setupPlayer();
 
-    TrackPlayer.addEventListener(Event.RemotePlay, () => TrackPlayer.play());
-    TrackPlayer.addEventListener(Event.RemotePause, () => TrackPlayer.pause());
+    TrackPlayer.addEventListener(Event.RemotePlay, () => {
+        TrackPlayer.play()
+    });
+    TrackPlayer.addEventListener(Event.RemotePause, () => {
+        TrackPlayer.pause()
+    });
 
     TrackPlayer.addEventListener(Event.RemoteSkip, () => TrackPlayer.skipToNext());
     TrackPlayer.addEventListener(Event.RemotePrevious, () => TrackPlayer.skipToPrevious());