1 files changed, 4 insertions, 4 deletions

diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index 1254900844..deab0eaf60 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -319,13 +319,13 @@ const char *get_token_value(struct gui_wps *gwps,
 
 #ifdef HAVE_ALBUMART
         case WPS_TOKEN_ALBUMART_DISPLAY:
-            draw_album_art(gwps, audio_current_aa_hid(), false);
-            return NULL;
-
-        case WPS_TOKEN_ALBUMART_FOUND:
+            if (!data->albumart)
+                return NULL;
             if (audio_current_aa_hid() >= 0) {
+                data->albumart->draw = true;
                 return "C";
             }
+            data->albumart->draw = false;
             return NULL;
 #endif