diff --git a/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c b/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c
index c0df1f766e..5ad6c887bd 100644
--- a/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c
+++ b/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c
@@ -111,10 +111,11 @@ void lcd_write_data(const fb_data* p_bytes, int count)
 
         p_bytes++; /* next packed pixels */
 
-        /* While push fifo is not empty */
-        while ((DBOP_STAT & (1<<10)) == 0)
-            ;
+        /* Wait if push fifo is full */
+        while ((DBOP_STAT & (1<<6)) != 0);
     }
+    /* While push fifo is not empty */
+    while ((DBOP_STAT & (1<<10)) == 0);
 }