diff --git a/apps/tagcache.c b/apps/tagcache.c
index 8b6a46d937..d87a28d232 100644
--- a/apps/tagcache.c
+++ b/apps/tagcache.c
@@ -3549,8 +3549,8 @@ static bool commit(void)
             tcrc_buffer_unlock();
         }
 
-        /* Reload tagcache. */
-        if (tc_stat.ramcache_allocated > 0)
+        /* Reload tagcache only if we committed new entries */
+        if (tc_stat.ramcache_allocated > 0 && tch.entry_count > 0)
             tagcache_start_scan();
 #endif /* HAVE_TC_RAMCACHE */
 
diff --git a/firmware/target/arm/pcm-telechips.c b/firmware/target/arm/pcm-telechips.c
index 7f8829cda4..3fa55eafe9 100644
--- a/firmware/target/arm/pcm-telechips.c
+++ b/firmware/target/arm/pcm-telechips.c
@@ -92,6 +92,7 @@ static void sink_dma_init(void)
 
 static void sink_set_freq(uint16_t freq)
 {
+    (void)freq;
 }
 
 static void play_start_pcm(void)