diff --git a/mpdlisten.py b/mpdlisten.py
index 5504a79..ec5b287 100755
--- a/mpdlisten.py
+++ b/mpdlisten.py
@@ -210,9 +210,13 @@ def update_display(device, currentsong:dict, status:dict, mode:str, cursor_pos:i
     draw = ImageDraw.Draw(ui)
     if mode == 'playback':
         if len(currentsong):
-            draw.text((ui_text_x, 2), currentsong['artist'], fill="white", font=jfont)
-            draw.text((ui_text_x, 14), currentsong['title'], fill="white", font=jfont)
-            draw.text((ui_text_x, 26), currentsong['album'], fill="white", font=jfont)
+            # ~ draw.text((ui_text_x, 2), currentsong['artist'], fill="white", font=jfont)
+            # ~ draw.text((ui_text_x, 14), currentsong['title'], fill="white", font=jfont)
+            # ~ draw.text((ui_text_x, 26), currentsong['album'], fill="white", font=jfont)
+            if 'artist' in currentsong:
+                draw.text((ui_text_x, 2), currentsong['artist'], fill="white", font=jfont)
+            if 'title' in currentsong:
+                draw.text((ui_text_x, 14), currentsong['title'], fill="white", font=jfont)
             if 'elapsed' in status:
                 draw.text((ui_text_x, 38), "{}/{}".format(sectomin(status['elapsed']), sectomin(status['duration'])), fill="white", font=jfont)
     elif mode == 'browse':