diff --git a/src/js/views/discover/DiscoverCategory.js b/src/js/views/discover/DiscoverCategory.js
index 6cd7c704..517e2f83 100755
--- a/src/js/views/discover/DiscoverCategory.js
+++ b/src/js/views/discover/DiscoverCategory.js
@@ -18,14 +18,25 @@ class DiscoverCategory extends React.Component {
     this.setWindowTitle();
   }
 
-  componentWillReceiveProps(nextProps) {
-    if (nextProps.match.params.id != this.props.match.params.id) {
-      this.loadCategory();
-    }
+  componentDidUpdate = ({
+    match: {
+      params: {
+        id: prevId,
+      },
+    },
+    category: prevCategory,
+  }) => {
+    const {
+      match: {
+        params: {
+          id,
+        },
+      },
+      category,
+    } = this.props;
 
-    if (!this.props.category && nextProps.category) {
-      this.setWindowTitle(nextProps.category);
-    }
+    if (prevId !== id) this.loadCategory();
+    if (!prevCategory && category) this.setWindowTitle(category);
   }
 
   setWindowTitle(category = this.props.category) {
diff --git a/src/js/views/discover/DiscoverRecommendations.js b/src/js/views/discover/DiscoverRecommendations.js
index ad4d3eb9..dac986d8 100755
--- a/src/js/views/discover/DiscoverRecommendations.js
+++ b/src/js/views/discover/DiscoverRecommendations.js
@@ -158,11 +158,21 @@ class Discover extends React.Component {
     }
   }
 
-  componentWillReceiveProps(newProps, newState) {
-    // New seeds via URL
-    if (newProps.match.params.seeds != this.props.match.params.seeds) {
-      this.handleURLSeeds(newProps.match.params.seeds);
-    }
+  componentDiUpdate = ({
+    match: {
+      params: {
+        seeds: prevSeeds,
+      },
+    },
+  }) => {
+    const {
+      match: {
+        params: {
+          seeds,
+        },
+      },
+    } = this.props;
+    if (prevSeeds !== seeds) this.handleURLSeeds(seeds);
   }
 
   handleContextMenu(e) {
diff --git a/src/js/views/library/LibraryAlbums.js b/src/js/views/library/LibraryAlbums.js
index 19801564..bd67180f 100755
--- a/src/js/views/library/LibraryAlbums.js
+++ b/src/js/views/library/LibraryAlbums.js
@@ -55,35 +55,42 @@ class LibraryAlbums extends React.Component {
     }
   }
 
-  componentWillReceiveProps(newProps) {
-    if (newProps.mopidy_connected && (newProps.source == 'all' || newProps.source == 'local')) {
-      // We've just connected
-      if (!this.props.mopidy_connected) {
-        this.props.mopidyActions.getLibraryAlbums();
-      }
+  componentDidUpdate = ({
+    mopidy_connected: prev_mopidy_connected,
+  }) => {
+    const {
+      mopidy_connected,
+      google_enabled,
+      spotify_enabled,
+      source,
+      mopidyActions,
+      googleActions,
+      spotifyActions,
+      mopidy_library_albums_status,
+      google_library_albums_status,
+      spotify_library_albums_status,
+    } = this.props;
+
+    if (mopidy_connected && (source == 'all' || source == 'local')) {
+      if (!prev_mopidy_connected) mopidyActions.getLibraryAlbums();
 
       // Filter changed, but we haven't got this provider's library yet
-      if (this.props.source != 'all' && this.props.source != 'local' && newProps.mopidy_library_albums_status != 'finished' && newProps.mopidy_library_albums_status != 'started') {
-        this.props.mopidyActions.getLibraryAlbums();
+      if (source !== 'all' && source !== 'local' && mopidy_library_albums_status !== 'finished' && mopidy_library_albums_status !== 'started') {
+        mopidyActions.getLibraryAlbums();
       }
     }
 
-    if (newProps.google_enabled && (newProps.source == 'all' || newProps.source == 'google')) {
-      // We've just been enabled (or detected as such)
-      if (!this.props.google_enabled) {
-        this.props.googleActions.getLibraryAlbums();
-      }
-
+    if (google_enabled && (newProps.source == 'all' || newProps.source == 'google')) {
       // Filter changed, but we haven't got this provider's library yet
-      if (this.props.source != 'all' && this.props.source != 'google' && newProps.google_library_albums_status != 'finished' && newProps.google_library_albums_status != 'started') {
-        this.props.googleActions.getLibraryAlbums();
+      if (source !== 'all' && source !== 'google' && google_library_albums_status !== 'finished' && google_library_albums_status !== 'started') {
+        googleActions.getLibraryAlbums();
       }
     }
 
-    if (newProps.spotify_enabled && (newProps.source == 'all' || newProps.source == 'spotify')) {
+    if (spotify_enabled && (source === 'all' || source === 'spotify')) {
       // Filter changed, but we haven't got this provider's library yet
-      if (newProps.spotify_library_albums_status != 'finished' && newProps.spotify_library_albums_status != 'started') {
-        this.props.spotifyActions.getLibraryAlbums();
+      if (spotify_library_albums_status !== 'finished' && spotify_library_albums_status !== 'started') {
+        spotifyActions.getLibraryAlbums();
       }
     }
   }