diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php
index b85bc76b..29da03f8 100644
--- a/resources/views/layouts/master.blade.php
+++ b/resources/views/layouts/master.blade.php
@@ -443,7 +443,11 @@
 			$(document).on('onAirUpdated', function(evt, data) {
 				if(data.inProgram) {
 					$nowPlaying.title.text(data.program.name).attr('title', data.program.name);
-					$nowPlaying.artist.text(data.program.tagline);
+					if(data.current && data.current.title) {
+						$nowPlaying.artist.text(data.current.title + (data.current.artist ? ' - ' + data.current.artist : ''));
+                                        } else {
+						$nowPlaying.artist.text(data.program.tagline);
+					}
 				} else {
 					$nowPlaying.programLabel.text(data.program.name).attr('title', data.program.name + "\n" + data.program.tagline);
 					$nowPlaying.title.text(data.current.title).attr('title', data.current.title);