diff --git a/.idea/other.xml b/.idea/other.xml
index 104e542..b45a6e0 100644
--- a/.idea/other.xml
+++ b/.idea/other.xml
@@ -14,6 +14,17 @@
           <option name="screenX" value="720" />
           <option name="screenY" value="1280" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="OPPO" />
+          <option name="codename" value="OP573DL1" />
+          <option name="id" value="OP573DL1" />
+          <option name="manufacturer" value="OPPO" />
+          <option name="name" value="CPH2557" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="28" />
           <option name="brand" value="DOCOMO" />
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/player/AudioContentPlayerFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/player/AudioContentPlayerFragment.kt
index af2d168..c161c08 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/player/AudioContentPlayerFragment.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/player/AudioContentPlayerFragment.kt
@@ -236,7 +236,11 @@ class AudioContentPlayerFragment(
             override fun onPlaybackStateChanged(playbackState: Int) {
                 mediaController?.let {
                     when (playbackState) {
-                        Player.STATE_ENDED -> it.seekTo(0)
+                        Player.STATE_ENDED -> {
+                            it.seekTo(0)
+                            it.pause()
+                        }
+
                         else -> {}
                     }
                 }
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/player/AudioContentPlayerService.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/player/AudioContentPlayerService.kt
index 59b3615..bd1a7e9 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/player/AudioContentPlayerService.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/player/AudioContentPlayerService.kt
@@ -104,8 +104,6 @@ class AudioContentPlayerService : MediaSessionService() {
                 } else if (playbackState == Player.STATE_ENDED) {
                     if (playlistManager!!.hasNextContent()) {
                         playNextContent()
-                    } else {
-                        onStopService()
                     }
                 }
             }
@@ -267,8 +265,8 @@ class AudioContentPlayerService : MediaSessionService() {
                 content.id,
                 onSuccess = { urlGenerateSuccess(content, it) },
                 onFailure = {
-                    if (playlistManager!!.hasNextContent()) {
-                        playNextContent()
+                    if (playlistManager!!.hasPreviousContent()) {
+                        playPreviousContent()
                     } else {
                         onStopService()
                     }
@@ -291,7 +289,7 @@ class AudioContentPlayerService : MediaSessionService() {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(
                     {
-                        if (it.success && it.data != null) {
+                        if (it.success && it.data != null && it.data.contentUrl.isNotBlank()) {
                             onSuccess(it.data.contentUrl)
                         } else {
                             onFailure()
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/player/AudioContentPlaylistManager.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/player/AudioContentPlaylistManager.kt
index cd1c373..79d9550 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/player/AudioContentPlaylistManager.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/player/AudioContentPlaylistManager.kt
@@ -24,4 +24,8 @@ class AudioContentPlaylistManager(private val playlist: List<AudioContentPlaylis
     fun hasNextContent(): Boolean {
         return currentIndex + 1 < playlist.size
     }
+
+    fun hasPreviousContent(): Boolean {
+        return currentIndex - 1 > 0
+    }
 }