2 files changed, 6 insertions, 2 deletions

diff --git a/apps/features.txt b/apps/features.txt
index 14204dfb6d..d3e433ad45 100644
--- a/apps/features.txt
+++ b/apps/features.txt
@@ -42,6 +42,10 @@ button_light
 buttonlight_brightness
 #endif
 
+#if defined(HAVE_CROSSFADE)
+crossfade
+#endif
+
 #if defined(HAVE_DIRCACHE)
 dircache
 #endif
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index a456bbca23..d4adfa8c85 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -770,10 +770,10 @@ const char *get_token_value(struct gui_wps *gwps,
             if (intval)
                 *intval = global_settings.crossfade + 1;
             snprintf(buf, buf_size, "%d", global_settings.crossfade);
-            return buf;
 #else
-            return NULL;
+            snprintf(buf, buf_size, "%d", 0);
 #endif
+            return buf;
 
         case WPS_TOKEN_REPLAYGAIN:
         {