diff --git a/firmware/drivers/lcd-player.c b/firmware/drivers/lcd-player.c
index ea759544eb..28bbfabd34 100644
--- a/firmware/drivers/lcd-player.c
+++ b/firmware/drivers/lcd-player.c
@@ -264,6 +264,7 @@ void lcd_clear_display(void)
     int i;
     bool update=false; 
     DEBUGF("lcd_clear_display()\n");
+    lcd_stop_scroll();
     for (i=0;i<22;i++)
       update|=lcdx_putc(i%11, i/11, ' ');
     if (update)
diff --git a/firmware/drivers/lcd-recorder.c b/firmware/drivers/lcd-recorder.c
index 24c481144f..80d8a9be57 100644
--- a/firmware/drivers/lcd-recorder.c
+++ b/firmware/drivers/lcd-recorder.c
@@ -216,6 +216,7 @@ void lcd_roll(int lines)
 void lcd_clear_display (void)
 {
     memset (lcd_framebuffer, 0, sizeof lcd_framebuffer);
+    lcd_stop_scroll();
 }
 
 void lcd_setmargins(int x, int y)
@@ -290,9 +291,7 @@ void lcd_puts(int x, int y, unsigned char *str)
     lcd_putsxy(xpos, ypos, str);
     lcd_clearrect(xpos + w, ypos, LCD_WIDTH - (xpos + w), h);
 
-#if defined(SIMULATOR) && defined(HAVE_LCD_CHARCELLS)
-    /* this function is being used when simulating a charcell LCD and
-       then we update immediately */
+#if defined(SIMULATOR)
     lcd_update();
 #endif
 }