diff --git a/app/src/main/java/com/brouken/player/PlayerActivity.java b/app/src/main/java/com/brouken/player/PlayerActivity.java
index 1e2a7f18..7c76c072 100644
--- a/app/src/main/java/com/brouken/player/PlayerActivity.java
+++ b/app/src/main/java/com/brouken/player/PlayerActivity.java
@@ -1295,16 +1295,10 @@ public void initializePlayer() {
             MediaItem.Builder mediaItemBuilder = new MediaItem.Builder()
                     .setUri(mPrefs.mediaUri)
                     .setMimeType(mPrefs.mediaType);
-            String title;
             if (apiTitle != null) {
-                title = apiTitle;
-            } else {
-                title = Utils.getFileName(PlayerActivity.this, mPrefs.mediaUri);
-            }
-            if (title != null) {
                 final MediaMetadata mediaMetadata = new MediaMetadata.Builder()
-                        .setTitle(title)
-                        .setDisplayTitle(title)
+                        .setTitle(apiTitle)
+                        .setDisplayTitle(apiTitle)
                         .build();
                 mediaItemBuilder.setMediaMetadata(mediaMetadata);
             }
@@ -1426,6 +1420,15 @@ public void releasePlayer(boolean save) {
     }
 
     private class PlayerListener implements Player.Listener {
+        @Override
+        public void onMediaMetadataChanged(MediaMetadata mediaMetadata) {
+            if (mediaMetadata.title != null && mediaMetadata.title.length() > 0) {
+                titleView.setText(mediaMetadata.title);
+            } else if (apiTitle == null) {
+                titleView.setText(Utils.getFileName(PlayerActivity.this, mPrefs.mediaUri));
+            }
+        }
+
         @Override
         public void onAudioSessionIdChanged(int audioSessionId) {
             try {