diff --git a/skill/app.py b/skill/app.py
index bafa026..2d61b2f 100755
--- a/skill/app.py
+++ b/skill/app.py
@@ -375,15 +375,22 @@ class NaviSonicPlayMusicByCurrentArtist(AbstractRequestHandler):
         artist_lookup = connection.search_artist(t["artist"])
         artist_album_lookup = connection.albums_by_artist(artist_lookup[0].get('id'))
         song_id_list = connection.build_song_list_from_albums(artist_album_lookup, min_song_count)
-        play_queue.clea
+        play_queue.clear()
         
         controller.enqueue_songs(connection, play_queue, [song_id_list[0], song_id_list[1]])  # When generating the playlist return the first two tracks.
         backgroundProcess = Process(target=queue_worker_thread, args=(connection, play_queue, song_id_list[2:]))  # Create a thread to enqueue the remaining tracks
         backgroundProcess.start()  # Start the additional thread
 
-        text = f'Tocando mais músicas de {t["_sanitized"]["artist"]}'
-        handler_input.response_builder.speak(text)
-        return handler_input.response_builder.response
+        speech = sanitise_speech_output(f'Tocando mais músicas de {t["artist"]}')
+        logger.info(speech)
+
+        card = {'title': 'AskNavidrome',
+                'text': speech
+                }
+
+        play_queue.shuffle()
+        track_details = play_queue.get_next_track()
+        return controller.start_playback('play', speech, card, track_details, handler_input)
 
 class NaviSonicPlayMusicByCurrentAlbum(AbstractRequestHandler):
     """Handle NaviSonicPlayMusicByCurrentAlbum Intent
@@ -414,9 +421,16 @@ class NaviSonicPlayMusicByCurrentAlbum(AbstractRequestHandler):
         backgroundProcess = Process(target=queue_worker_thread, args=(connection, play_queue, song_id_list[2:]))  # Create a thread to enqueue the remaining tracks
         backgroundProcess.start()  # Start the additional thread
 
-        text = f'Tocando mais músicas de do album {t["_sanitized"]["album"]}'
-        handler_input.response_builder.speak(text)
-        return handler_input.response_builder.response
+        speech = sanitise_speech_output(f'Tocando mais músicas do album {t["album"]}, de {t["artist"]}')
+        logger.info(speech)
+
+        card = {'title': 'AskNavidrome',
+                'text': speech
+                }
+
+        play_queue.shuffle()
+        track_details = play_queue.get_next_track()
+        return controller.start_playback('play', speech, card, track_details, handler_input)
 
 class NaviSonicPlayAlbumByArtist(AbstractRequestHandler):
     """Handle NaviSonicPlayAlbumByArtist