diff --git a/firmware/drivers/lcd-scroll.c b/firmware/drivers/lcd-scroll.c
index 5162f9a100..74606b1ed7 100644
--- a/firmware/drivers/lcd-scroll.c
+++ b/firmware/drivers/lcd-scroll.c
@@ -200,7 +200,7 @@ bool LCDFN(scroll_now)(struct scrollinfo *s)
 
     return ended;
 }
-
+#if (!defined(BOOTLOADER) && !defined(HAVE_REMOTE_LCD)) || defined(HAVE_LCD_CHARCELLS)
 static void LCDFN(scroll_worker)(void)
 {
     int index;
@@ -251,3 +251,4 @@ static void LCDFN(scroll_worker)(void)
             s->start_tick += si->delay + si->ticks;
     }
 }
+#endif /*!BOOTLOADER*/
diff --git a/firmware/scroll_engine.c b/firmware/scroll_engine.c
index cb0051dac7..aacaa496e7 100644
--- a/firmware/scroll_engine.c
+++ b/firmware/scroll_engine.c
@@ -185,10 +185,12 @@ static void scroll_thread(void)
     while (1)
     {
         sleep(lcd_scroll_info.ticks);
+#if !defined(BOOTLOADER) || defined(HAVE_LCD_CHARCELLS)
 #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP)
         if (lcd_active())
 #endif
             lcd_scroll_worker();
+#endif /*!BOOTLOADER\HAVE_LCD_CHARCELLS*/
     }
 }
 #endif /* HAVE_REMOTE_LCD */