diff --git a/src/js/views/library/LibraryAlbums.js b/src/js/views/library/LibraryAlbums.js
index 524dc041..a179aabb 100755
--- a/src/js/views/library/LibraryAlbums.js
+++ b/src/js/views/library/LibraryAlbums.js
@@ -56,7 +56,7 @@ class LibraryAlbums extends React.Component{
 			}			
 		}
 
-		if (newProps.spotify_connected && (newProps.source == 'all' || newProps.source == 'spotify')){
+		if (newProps.spotify_connected && newProps.mopidy_uri_schemes.includes('spotify:') && (newProps.source == 'all' || newProps.source == 'spotify')){
 
 			// We've just connected
 			if (!this.props.spotify_connected){
@@ -207,12 +207,15 @@ class LibraryAlbums extends React.Component{
 			{
 				value: 'local',
 				label: 'Local'
-			},
-			{
+			}
+		];
+
+		if (this.props.mopidy_uri_schemes.includes('spotify:')){
+			source_options.push({
 				value: 'spotify',
 				label: 'Spotify'
-			}
-		]
+			});
+		}
 
 		var view_options = [
 			{
@@ -276,6 +279,7 @@ class LibraryAlbums extends React.Component{
 const mapStateToProps = (state, ownProps) => {
 	return {
 		mopidy_connected: state.mopidy.connected,
+		mopidy_uri_schemes: state.mopidy.uri_schemes,
 		spotify_connected: state.spotify.connected,
 		load_queue: state.ui.load_queue,
 		albums: state.core.albums,
diff --git a/src/js/views/library/LibraryArtists.js b/src/js/views/library/LibraryArtists.js
index c03f1968..213fbb7d 100755
--- a/src/js/views/library/LibraryArtists.js
+++ b/src/js/views/library/LibraryArtists.js
@@ -33,7 +33,7 @@ class LibraryArtists extends React.Component{
 			this.props.mopidyActions.getLibraryArtists()
 		}
 
-		if (this.props.spotify_library_artists_status != 'finished' && this.props.spotify_connected && (this.props.source == 'all' || this.props.source == 'spotify')){
+		if (this.props.mopidy_uri_schemes.includes('spotify:') && this.props.spotify_library_artists_status != 'finished' && this.props.spotify_connected && (this.props.source == 'all' || this.props.source == 'spotify')){
 			this.props.spotifyActions.getLibraryArtists()
 		}
 	}
@@ -52,7 +52,7 @@ class LibraryArtists extends React.Component{
 			}			
 		}
 
-		if (newProps.spotify_connected && (newProps.source == 'all' || newProps.source == 'spotify')){
+		if (newProps.mopidy_uri_schemes.includes('spotify:') && newProps.spotify_connected && (newProps.source == 'all' || newProps.source == 'spotify')){
 
 			// We've just connected
 			if (!this.props.spotify_connected){
@@ -178,12 +178,15 @@ class LibraryArtists extends React.Component{
 			{
 				value: 'local',
 				label: 'Local'
-			},
-			{
+			}
+		];
+
+		if (this.props.mopidy_uri_schemes.includes('spotify:')){
+			source_options.push({
 				value: 'spotify',
 				label: 'Spotify'
-			}
-		]
+			});
+		}
 
 		var view_options = [
 			{
@@ -194,7 +197,7 @@ class LibraryArtists extends React.Component{
 				label: 'List',
 				value: 'list'
 			}
-		]
+		];
 
 		var sort_options = [
 			{
@@ -209,7 +212,7 @@ class LibraryArtists extends React.Component{
 				label: 'Popularity',
 				value: 'popularity'
 			}
-		]
+		];
 
 		var options = (
 			<span>
@@ -240,6 +243,7 @@ const mapStateToProps = (state, ownProps) => {
 	return {
 		mopidy_connected: state.mopidy.connected,
 		spotify_connected: state.spotify.connected,
+		mopidy_uri_schemes: state.mopidy.uri_schemes,
 		mopidy_library_artists: state.mopidy.library_artists,
 		mopidy_library_artists_status: (state.ui.processes.MOPIDY_LIBRARY_ARTISTS_PROCESSOR !== undefined ? state.ui.processes.MOPIDY_LIBRARY_ARTISTS_PROCESSOR.status : null),
 		spotify_library_artists: state.spotify.library_artists,
diff --git a/src/js/views/library/LibraryPlaylists.js b/src/js/views/library/LibraryPlaylists.js
index 028045ea..000f0798 100755
--- a/src/js/views/library/LibraryPlaylists.js
+++ b/src/js/views/library/LibraryPlaylists.js
@@ -35,7 +35,7 @@ class LibraryPlaylists extends React.Component{
 			this.props.mopidyActions.getLibraryPlaylists()
 		}
 
-		if (this.props.spotify_library_playlists_status !== 'finished' && this.props.spotify_connected && (this.props.source == 'all' || this.props.source == 'spotify')){
+		if (this.props.mopidy_uri_schemes.includes('spotify:') && this.props.spotify_library_playlists_status !== 'finished' && this.props.spotify_connected && (this.props.source == 'all' || this.props.source == 'spotify')){
 			this.props.spotifyActions.getLibraryPlaylists()
 		}
 	}
@@ -54,7 +54,7 @@ class LibraryPlaylists extends React.Component{
 			}			
 		}
 
-		if (newProps.spotify_connected && (newProps.source == 'all' || newProps.source == 'spotify')){
+		if (newProps.mopidy_uri_schemes.includes('spotify:') && newProps.spotify_connected && (newProps.source == 'all' || newProps.source == 'spotify')){
 
 			// We've just connected
 			if (!this.props.spotify_connected){
@@ -192,12 +192,15 @@ class LibraryPlaylists extends React.Component{
 			{
 				value: 'local',
 				label: 'Local'
-			},
-			{
+			}
+		];		
+
+		if (this.props.mopidy_uri_schemes.includes('spotify:')){
+			source_options.push({
 				value: 'spotify',
 				label: 'Spotify'
-			}
-		]
+			});
+		}
 
 		var view_options = [
 			{
@@ -208,7 +211,7 @@ class LibraryPlaylists extends React.Component{
 				value: 'list',
 				label: 'List'
 			}
-		]
+		];
 
 		var sort_options = [
 			{
@@ -231,7 +234,7 @@ class LibraryPlaylists extends React.Component{
 				value: 'source',
 				label: 'Source'
 			}
-		]
+		];
 
 		var options = (
 			<span>
@@ -267,6 +270,7 @@ const mapStateToProps = (state, ownProps) => {
 		slim_mode: state.ui.slim_mode,
 		mopidy_connected: state.mopidy.connected,
 		spotify_connected: state.spotify.connected,
+		mopidy_uri_schemes: state.mopidy.uri_schemes,
 		mopidy_library_playlists: state.mopidy.library_playlists,
 		mopidy_library_playlists_status: (state.ui.processes.MOPIDY_LIBRARY_PLAYLISTS_PROCESSOR !== undefined ? state.ui.processes.MOPIDY_LIBRARY_PLAYLISTS_PROCESSOR.status : null),
 		spotify_library_playlists: state.spotify.library_playlists,