diff --git a/src/fw_artists.py b/src/fw_artists.py
index e958c56..ee52755 100644
--- a/src/fw_artists.py
+++ b/src/fw_artists.py
@@ -32,7 +32,12 @@ def list_artists(pg=None, search=None):
         print('Search by artist:')
         list_artists(search=input())
     else:
-        list_albums(albums=artists_results[int(select)].get('albums'))
+        albums = artists_results[int(select)].get('albums')
+        if albums:
+            list_albums(albums=albums)
+        else: # Fallback on tracks of selected artist
+            play_artist(artists_results[int(select)]['id'])
+
 
 
 def play_artist(artist_id):