diff --git a/app/src/main/java/com/dkanada/gramophone/service/MultiPlayer.java b/app/src/main/java/com/dkanada/gramophone/service/MultiPlayer.java
index 03ba6b9d..d0f5d181 100644
--- a/app/src/main/java/com/dkanada/gramophone/service/MultiPlayer.java
+++ b/app/src/main/java/com/dkanada/gramophone/service/MultiPlayer.java
@@ -64,6 +64,11 @@ public class MultiPlayer implements Playback {
             }
         }
 
+        @Override
+        public void onPositionDiscontinuity(int reason) {
+            Log.i(TAG, String.format("onPositionDiscontinuity: %d", reason));
+        }
+
         @Override
         public void onPlayerError(ExoPlaybackException error) {
             Log.i(TAG, String.format("onPlayerError: %s", error.getMessage()));
diff --git a/app/src/main/java/com/dkanada/gramophone/service/MusicService.java b/app/src/main/java/com/dkanada/gramophone/service/MusicService.java
index ee773726..c8677a5d 100644
--- a/app/src/main/java/com/dkanada/gramophone/service/MusicService.java
+++ b/app/src/main/java/com/dkanada/gramophone/service/MusicService.java
@@ -1051,12 +1051,13 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
             prepareNext();
         } else if (reason == PLAY_WHEN_READY_CHANGE_REASON_END_OF_MEDIA_ITEM) {
             progressHandler.sendEmptyMessage(TRACK_ENDED);
-            acquireWakeLock(30000);
         }
     }
 
     @Override
     public void onTrackChanged(int reason) {
+        acquireWakeLock(30000);
+
         if (reason == MEDIA_ITEM_TRANSITION_REASON_AUTO) {
             playerHandler.sendEmptyMessage(TRACK_CHANGED);
             progressHandler.sendEmptyMessage(TRACK_CHANGED);