diff --git a/src/components/DownloadManager.ts b/src/components/DownloadManager.ts
index 245cc29..ff5f935 100644
--- a/src/components/DownloadManager.ts
+++ b/src/components/DownloadManager.ts
@@ -20,7 +20,7 @@ const MAX_CONCURRENT_DOWNLOADS = 5;
 function DownloadManager () {
     // Retrieve store helpers
     const sourceId = useSourceId();
-    const { queued, ids, entities } = useDownloads(sourceId);
+    const { queued, ids, entities } = useDownloads();
     
     // Keep state for the currently active downloads (i.e. the downloads that
     // have actually been pushed out to react-native-fs).
diff --git a/src/screens/Downloads/index.tsx b/src/screens/Downloads/index.tsx
index 58e20b2..6b59c9b 100644
--- a/src/screens/Downloads/index.tsx
+++ b/src/screens/Downloads/index.tsx
@@ -42,7 +42,7 @@ function Downloads() {
     const getImage = useGetImage();
     const sourceId = useSourceId();
 
-    const { entities, ids } = useDownloads(sourceId);
+    const { entities, ids } = useDownloads();
     const { tracks } = useTracks(sourceId);
 
     // Calculate the total download size
diff --git a/src/screens/Music/stacks/Album.tsx b/src/screens/Music/stacks/Album.tsx
index 0fb9221..c626fa2 100644
--- a/src/screens/Music/stacks/Album.tsx
+++ b/src/screens/Music/stacks/Album.tsx
@@ -31,7 +31,7 @@ function SimilarAlbum({ id }: { id: string }) {
     const navigation = useNavigation<NavigationProp>();
     const getImage = useGetImage();
     const sourceId = useSourceId();
-    const { albums } = useAlbums(sourceId);
+    const { albums } = useAlbums();
     const album = albums[id];
 
     const handlePress = useCallback(() => {
@@ -60,9 +60,9 @@ const Album: React.FC = () => {
 
     // Retrieve the album data from the store
     const sourceId = useSourceId();
-    const { albums } = useAlbums(sourceId);
+    const { albums } = useAlbums();
     const album = albums[id];
-    const { ids: albumTrackIds } = useTracksByAlbum(sourceId, id);
+    const { ids: albumTrackIds } = useTracksByAlbum(id);
 
     // Define a function for refreshing this entity
     const refresh = useCallback(async () => { 
diff --git a/src/screens/Music/stacks/Albums.tsx b/src/screens/Music/stacks/Albums.tsx
index 5394bac..e25be94 100644
--- a/src/screens/Music/stacks/Albums.tsx
+++ b/src/screens/Music/stacks/Albums.tsx
@@ -78,8 +78,8 @@ const GeneratedAlbumItem = React.memo(function GeneratedAlbumItem(props: Generat
 const Albums: React.FC = () => {
     // Retrieve data from store
     const sourceId = useSourceId();
-    const { albums, isLoading, lastRefreshed } = useAlbums(sourceId);
-    const sections = useAlbumsByAlphabet(sourceId);
+    const { albums, isLoading, lastRefreshed } = useAlbums();
+    const sections = useAlbumsByAlphabet();
     
     // Initialise helpers
     const navigation = useNavigation<NavigationProp>();
diff --git a/src/screens/Music/stacks/Artists.tsx b/src/screens/Music/stacks/Artists.tsx
index f8ed2ee..721c920 100644
--- a/src/screens/Music/stacks/Artists.tsx
+++ b/src/screens/Music/stacks/Artists.tsx
@@ -103,8 +103,8 @@ const GeneratedArtistItem = React.memo(function GeneratedArtistItem(props: Gener
 const Artists: React.FC = () => {
     // Retrieve data from store
     const sourceId = useSourceId();
-    const { isLoading, lastRefreshed } = useArtists(sourceId);
-    const sections = useArtistsByAlphabet(sourceId);
+    const { isLoading, lastRefreshed } = useArtists();
+    const sections = useArtistsByAlphabet();
     
     // Initialise helpers
     const navigation = useNavigation<NavigationProp>();
diff --git a/src/screens/Music/stacks/Playlist.tsx b/src/screens/Music/stacks/Playlist.tsx
index bfe175c..208feef 100644
--- a/src/screens/Music/stacks/Playlist.tsx
+++ b/src/screens/Music/stacks/Playlist.tsx
@@ -16,9 +16,9 @@ const Playlist: React.FC = () => {
 
     // Retrieve the playlist data from the store
     const sourceId = useSourceId();
-    const { playlists } = usePlaylists(sourceId);
+    const { playlists } = usePlaylists();
     const playlist = playlists[id];
-    const { ids: playlistTrackIds } = useTracksByPlaylist(sourceId, id);
+    const { ids: playlistTrackIds } = useTracksByPlaylist(id);
 
     // Define a function for refreshing this entity
     const refresh = useCallback(
diff --git a/src/screens/Music/stacks/Playlists.tsx b/src/screens/Music/stacks/Playlists.tsx
index fdff4b0..33c4d36 100644
--- a/src/screens/Music/stacks/Playlists.tsx
+++ b/src/screens/Music/stacks/Playlists.tsx
@@ -39,7 +39,7 @@ const Playlists: React.FC = () => {
 
     // Retrieve data from store
     const sourceId = useSourceId();
-    const { playlists, ids, isLoading, lastRefreshed } = usePlaylists(sourceId);
+    const { playlists, ids, isLoading, lastRefreshed } = usePlaylists();
     
     // Initialise helpers
     const navigation = useNavigation<NavigationProp>();
diff --git a/src/screens/Music/stacks/RecentAlbums.tsx b/src/screens/Music/stacks/RecentAlbums.tsx
index 60c3126..a49fecc 100644
--- a/src/screens/Music/stacks/RecentAlbums.tsx
+++ b/src/screens/Music/stacks/RecentAlbums.tsx
@@ -63,8 +63,8 @@ const RecentAlbums: React.FC = () => {
 
     // Retrieve data from store
     const sourceId = useSourceId();
-    const { albums, isLoading } = useAlbums(sourceId);
-    const { ids: recentAlbumIds } = useRecentAlbums(sourceId, 24);
+    const { albums, isLoading } = useAlbums();
+    const { ids: recentAlbumIds } = useRecentAlbums( 24);
 
     // Initialise helpers
     const navigation = useNavigation<NavigationProp>();