diff --git a/homeassistant/components/media_player/mpd.py b/homeassistant/components/media_player/mpd.py
index a61dac88150..9d48f1458eb 100644
--- a/homeassistant/components/media_player/mpd.py
+++ b/homeassistant/components/media_player/mpd.py
@@ -142,12 +142,15 @@ class MpdDevice(MediaPlayerDevice):
     def media_title(self):
         """ Title of current playing media. """
         name = self.currentsong.get('name', None)
-        title = self.currentsong['title']
+        title = self.currentsong.get('title', None)
 
         if name is None:
             return title
         else:
-            return '{}: {}'.format(name, title)
+            if title is None:
+                return name
+            else:
+                return '{}: {}'.format(name, title)
 
     @property
     def media_artist(self):