diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaPlayerService.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaPlayerService.java
index f808959c..c7ae0cf7 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaPlayerService.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaPlayerService.java
@@ -146,7 +146,7 @@ public class MediaPlayerService extends Service
         downloader.onCreate();
         shufflePlayBuffer.onCreate();
 
-        localMediaPlayer.onCreate();
+        localMediaPlayer.init();
         setupOnCurrentPlayingChangedHandler();
         setupOnPlayerStateChangedHandler();
         setupOnSongCompletedHandler();
@@ -198,7 +198,7 @@ public class MediaPlayerService extends Service
         instance = null;
 
         try {
-            localMediaPlayer.onDestroy();
+            localMediaPlayer.release();
             downloader.stop();
             shufflePlayBuffer.onDestroy();
         } catch (Throwable ignored) {
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/LocalMediaPlayer.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/LocalMediaPlayer.kt
index 8d411a84..87df94f7 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/LocalMediaPlayer.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/LocalMediaPlayer.kt
@@ -85,7 +85,7 @@ class LocalMediaPlayer(
     private val pm = context.getSystemService(POWER_SERVICE) as PowerManager
     private val wakeLock: WakeLock = pm.newWakeLock(PARTIAL_WAKE_LOCK, this.javaClass.name)
 
-    fun onCreate() {
+    fun init() {
         Thread {
             Thread.currentThread().name = "MediaPlayerThread"
             Looper.prepare()
@@ -126,7 +126,7 @@ class LocalMediaPlayer(
         Timber.i("LocalMediaPlayer created")
     }
 
-    fun onDestroy() {
+    fun release() {
         reset()
         try {
             val i = Intent(AudioEffect.ACTION_CLOSE_AUDIO_EFFECT_CONTROL_SESSION)
@@ -136,6 +136,9 @@ class LocalMediaPlayer(
             EqualizerController.release()
             VisualizerController.release()
             mediaPlayer.release()
+
+            mediaPlayer = MediaPlayer()
+
             if (nextMediaPlayer != null) {
                 nextMediaPlayer!!.release()
             }