diff --git a/homeassistant/components/sensor/plex.py b/homeassistant/components/sensor/plex.py
index 87af51d2bbd..505983cb3a7 100644
--- a/homeassistant/components/sensor/plex.py
+++ b/homeassistant/components/sensor/plex.py
@@ -115,9 +115,41 @@ class PlexSensor(Entity):
         sessions = self._server.sessions()
         now_playing = []
         for sess in sessions:
-            user = sess.usernames[0] if sess.usernames is not None else ""
-            title = sess.title if sess.title is not None else ""
-            year = sess.year if sess.year is not None else ""
-            now_playing.append((user, "{0} ({1})".format(title, year)))
+            user = sess.usernames[0]
+            device = sess.players[0].title
+            now_playing_user = "{0} - {1}".format(user, device)
+            now_playing_title = ""
+
+            if sess.TYPE == 'episode':
+                # example:
+                # "Supernatural (2005) - S01 · E13 - Route 666"
+                season_title = sess.grandparentTitle
+                if sess.show().year is not None:
+                    season_title += " ({0})".format(sess.show().year)
+                season_episode = "S{0}".format(sess.parentIndex)
+                if sess.index is not None:
+                    season_episode += " · E{1}".format(sess.index)
+                episode_title = sess.title
+                now_playing_title = "{0} - {1} - {2}".format(season_title,
+                                                             season_episode,
+                                                             episode_title)
+            elif sess.TYPE == 'track':
+                # example:
+                # "Billy Talent - Afraid of Heights - Afraid of Heights"
+                track_artist = sess.grandparentTitle
+                track_album = sess.parentTitle
+                track_title = sess.title
+                now_playing_title = "{0} - {1} - {2}".format(track_artist,
+                                                             track_album,
+                                                             track_title)
+            else:
+                # example:
+                # "picture_of_last_summer_camp (2015)"
+                # "The Incredible Hulk (2008)"
+                now_playing_title = sess.title
+                if sess.year is not None:
+                    now_playing_title += " ({0})".format(sess.year)
+
+            now_playing.append((now_playing_user, now_playing_title))
         self._state = len(sessions)
         self._now_playing = now_playing