diff --git a/feeluown/player/playlist.py b/feeluown/player/playlist.py
index d5af50251..6665ab459 100644
--- a/feeluown/player/playlist.py
+++ b/feeluown/player/playlist.py
@@ -298,6 +298,35 @@ def insert_after_current_song(self, song):
             self._songs.insert(index + 1, song)
             self.songs_added.emit(index + 1, 1)
 
+    def remove_no_lock(self, song):
+        try:
+            index = self._songs.index(song)
+        except ValueError:
+            logger.debug('Remove failed: {} not in playlist'.format(song))
+        else:
+            if self._current_song is None:
+                self._songs.remove(song)
+            elif song == self._current_song:
+                next_song = self._get_next_song_no_lock()
+                # 随机模式下或者歌单只剩一首歌曲，下一首可能和当前歌曲相同
+                if next_song == self.current_song:
+                    # Should set current song immediately.
+                    # Should not use set_current_song, because it is an async task.
+                    self.set_current_song_none()
+                    self._songs.remove(song)
+                    new_next_song = self._get_next_song_no_lock()
+                    self.set_existing_song_as_current_song(new_next_song)
+                else:
+                    next_song = self._get_next_song_no_lock()
+                    self._songs.remove(song)
+                    self.set_existing_song_as_current_song(next_song)
+            else:
+                self._songs.remove(song)
+            self.songs_removed.emit(index, 1)
+            logger.debug('Remove {} from player playlist'.format(song))
+        if song in self._bad_songs:
+            self._bad_songs.remove(song)
+
     def remove(self, song):
         """Remove song from playlist. O(n)
 
@@ -305,33 +334,7 @@ def remove(self, song):
         just remove it.
         """
         with self._songs_lock:
-            try:
-                index = self._songs.index(song)
-            except ValueError:
-                logger.debug('Remove failed: {} not in playlist'.format(song))
-            else:
-                if self._current_song is None:
-                    self._songs.remove(song)
-                elif song == self._current_song:
-                    next_song = self._get_next_song_no_lock()
-                    # 随机模式下或者歌单只剩一首歌曲，下一首可能和当前歌曲相同
-                    if next_song == self.current_song:
-                        # Should set current song immediately.
-                        # Should not use set_current_song, because it is an async task.
-                        self.set_current_song_none()
-                        self._songs.remove(song)
-                        new_next_song = self._get_next_song_no_lock()
-                        self.set_existing_song_as_current_song(new_next_song)
-                    else:
-                        next_song = self._get_next_song_no_lock()
-                        self._songs.remove(song)
-                        self.set_existing_song_as_current_song(next_song)
-                else:
-                    self._songs.remove(song)
-                self.songs_removed.emit(index, 1)
-                logger.debug('Remove {} from player playlist'.format(song))
-            if song in self._bad_songs:
-                self._bad_songs.remove(song)
+            self.remove_no_lock(song)
 
     def init_from(self, songs):
         warnings.warn(
@@ -741,13 +744,28 @@ async def a_play_model(self, model):
         else:
             fn = self.a_set_current_model
             upgrade_fn = self._app.library.video_upgrade
+
         try:
             # Try to upgrade the model.
-            model = await aio.run_fn(upgrade_fn, model)
+            umodel = await aio.run_fn(upgrade_fn, model)
         except ModelNotFound:
             pass
         except:  # noqa
             logger.exception(f'upgrade model:{model} failed')
+        else:
+            # Replace the brief model with the upgraded model
+            # when user try to play a brief model that is already in the playlist.
+            if isinstance(model, BriefSongModel):
+                with self._songs_lock:
+                    if model in self._songs:
+                        index = self._songs.index(model)
+                        self._songs.insert(index+1, umodel)
+                        if self.current_song == model:
+                            self.set_current_song_none()
+                        else:
+                            self._songs.remove(model)
+                        model = umodel
+
         try:
             await self._app.task_mgr.run_afn_preemptive(
                 fn, model, name=TASK_SET_CURRENT_MODEL
diff --git a/tests/player/test_playlist.py b/tests/player/test_playlist.py
index 4c8a05c43..87ad8d28c 100644
--- a/tests/player/test_playlist.py
+++ b/tests/player/test_playlist.py
@@ -99,6 +99,20 @@ async def test_play_model(pl, app_mock, song, mocker):
     assert pl._app.player.resume.called
 
 
+@pytest.mark.asyncio
+async def test_play_a_brief_song_model(
+        pl, app_mock, library, ekaf_song0, ekaf_brief_song0, mocker):
+    app_mock.library = library
+    pl.add(ekaf_brief_song0)
+    mocker.patch.object(pl, 'a_set_current_song')
+    await pl.a_play_model(ekaf_brief_song0)
+    # The song should be upgraded to a normal model
+    assert ekaf_brief_song0 not in pl.current_song
+    # Should called with the upgraded song model
+    app_mock.task_mgr.run_afn_preemptive.assert_called_once_with(
+        pl.a_set_current_song, ekaf_song0, name='playlist.set_current_model')
+
+
 def test_set_models(pl, song1, song2):
     # Set a nonexisting song as current song
     # The song should be inserted after current_song