1 files changed, 3 insertions, 2 deletions

diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index 758a8c1b04..e0d4595122 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -329,8 +329,9 @@ const char *get_token_value(struct gui_wps *gwps,
             
         case WPS_TOKEN_ALBUMART_DISPLAY:
             if (!data->albumart)
-                return NULL;            
-            data->albumart->draw = true;
+                return NULL;        
+                        if (!data->albumart->draw)
+                                data->albumart->draw = true;
             return NULL;
 #endif