diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 9cd2c9bb92..0dec3cd738 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -449,7 +449,7 @@ static bool dbg_buffering_thread(void)
 
             screens[i].putsf(0, line++, "data_rem: %ld", (long)d.data_rem);
 
-            screens[i].putsf(0, line++, "track count: %2d", audio_track_count());
+            screens[i].putsf(0, line++, "track count: %2u", audio_track_count());
 
             screens[i].putsf(0, line++, "handle count: %d", (int)d.num_handles);
 
diff --git a/apps/playback.c b/apps/playback.c
index e8aaf3bacc..8e18a479b9 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -3745,7 +3745,7 @@ size_t audio_get_filebuflen(void)
 }
 
 /* How many tracks exist on the buffer - full or partial */
-int audio_track_count(void)
+unsigned int audio_track_count(void)
     __attribute__((alias("track_list_count")));
 
 /* Return total ringbuffer space occupied - ridx to widx */
diff --git a/apps/playback.h b/apps/playback.h
index 8a63bd7907..c2682e6baf 100644
--- a/apps/playback.h
+++ b/apps/playback.h
@@ -76,7 +76,7 @@ struct bufopen_bitmap_data {
 #endif /* HAVE_ALBUMART */
 
 /* Functions */
-int audio_track_count(void);
+unsigned int audio_track_count(void);
 long audio_filebufused(void);
 void audio_pre_ff_rewind(void);
 void audio_skip(int direction);