diff --git a/app/components/TrackPlayerState.tsx b/app/components/TrackPlayerState.tsx
index aed4356..e91c2c7 100644
--- a/app/components/TrackPlayerState.tsx
+++ b/app/components/TrackPlayerState.tsx
@@ -58,10 +58,9 @@ const CurrentTrackState = () => {
     <TrackPlayerEventResponder
       events={[
         Event.PlaybackQueueEnded,
+        Event.PlaybackTrackChanged,
         Event.PlaybackMetadataReceived,
         Event.RemoteDuck,
-        Event.RemoteNext,
-        Event.RemotePrevious,
         Event.RemoteStop,
       ]}
       update={update}
diff --git a/package.json b/package.json
index 747c2d8..f1325ca 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "react-native-safe-area-context": "^3.2.0",
     "react-native-screens": "^3.4.0",
     "react-native-tab-view": "^2.16.0",
-    "react-native-track-player": "https://github.com/austinried/react-native-track-player",
+    "react-native-track-player": "^2.0.0-rc18",
     "react-native-vector-icons": "^8.1.0",
     "uuid": "^8.3.2",
     "xmldom": "^0.5.0"
diff --git a/yarn.lock b/yarn.lock
index 0cf684c..2020d76 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5564,9 +5564,10 @@ react-native-tab-view@^2.16.0:
   resolved "https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-2.16.0.tgz#cae72c7084394bd328fac5fefb86cd966df37a86"
   integrity sha512-ac2DmT7+l13wzIFqtbfXn4wwfgtPoKzWjjZyrK1t+T8sdemuUvD4zIt+UImg03fu3s3VD8Wh/fBrIdcqQyZJWg==
 
-"react-native-track-player@https://github.com/austinried/react-native-track-player":
-  version "2.0.0-rc16"
-  resolved "https://github.com/austinried/react-native-track-player#358fd07b817575a494688dca5b093eebc0865a5d"
+react-native-track-player@^2.0.0-rc18:
+  version "2.0.0-rc18"
+  resolved "https://registry.yarnpkg.com/react-native-track-player/-/react-native-track-player-2.0.0-rc18.tgz#eb1a70c028bf25a0c653930023280aca949789fd"
+  integrity sha512-TsfUGwmIzvVcRKPyZ4ERLV37K/0PEtubgKBelRGe8DzUTdWFwQa2eabUYqqfy+HA3y+TBcXP8GNNHVq5gC/9Lw==
 
 react-native-vector-icons@^8.1.0:
   version "8.1.0"