2 files changed, 10 insertions, 4 deletions

diff --git a/apps/status.c b/apps/status.c
index c6f4e4944c..7e9233a63f 100644
--- a/apps/status.c
+++ b/apps/status.c
@@ -175,8 +175,9 @@ void status_draw(bool force_redraw)
         }
 
 #ifdef HAVE_LCD_BITMAP
-        if (battery_state)
+        if (battery_state && (info.battlevel > -1))
             statusbar_icon_battery(info.battlevel, plug_state);
+            
         statusbar_icon_volume(info.volume);
         statusbar_icon_play_state(current_mode + Icon_Play);
         switch (info.repeat) {
@@ -202,6 +203,7 @@ void status_draw(bool force_redraw)
 
 
 #if defined(HAVE_LCD_CHARCELLS)
+    if (info.battlevel > -1)
     lcd_icon(ICON_BATTERY, battery_state);
     lcd_icon(ICON_BATTERY_1, info.battlevel > 25);
     lcd_icon(ICON_BATTERY_2, info.battlevel > 50);
diff --git a/apps/wps-display.c b/apps/wps-display.c
index c6621b1e62..563bb265be 100644
--- a/apps/wps-display.c
+++ b/apps/wps-display.c
@@ -478,10 +478,14 @@ static char* get_tag(struct mp3entry* id3,
                     return buf;
 
                 case 't': /* estimated battery time */
-                    snprintf(buf, buf_size, "%dh %dm",
-                             battery_time() / 60,
-                             battery_time() % 60);
+                {
+                    int t = battery_time();
+                    if (t >= 0)
+                        snprintf(buf, buf_size, "%dh %dm", t / 60, t % 60);
+                    else
+                        strncpy(buf, "?h ?m", buf_size);
                     return buf;
+                }
             }
             break;